[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9363] Merge 9359:9362 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [9363] Merge 9359:9362 from trunk |
|
Date: |
Thu, 10 May 2012 13:56:59 +0000 |
Revision: 9363
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9363
Author: sigurdne
Date: 2012-05-10 13:56:59 +0000 (Thu, 10 May 2012)
Log Message:
-----------
Merge 9359:9362 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/controller/inc/class.uicalendar.inc.php
branches/Version-1_0-branch/controller/inc/component/class.year_calendar.inc.php
branches/Version-1_0-branch/controller/templates/base/calendar/check_list_status_checker.xsl
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_month.xsl
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_month_for_locations.xsl
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_year.xsl
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_year_for_locations.xsl
branches/Version-1_0-branch/controller/templates/base/css/base.css
branches/Version-1_0-branch/property/inc/class.soinvoice.inc.php
branches/Version-1_0-branch/property/inc/class.uiwo_hour.inc.php
Property Changed:
----------------
branches/Version-1_0-branch/
Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499,7501-7502,7504,7506-7507,7509-7511,7513-7517,7519-7521,7523,7525,7527-7529,7531,7533,7535-7538,7540-7542,7544-7549,7551-7552,7554-7561,7563,7565,7567-7573,7575-7578,7580-7584,7586-7591,7593-7624,7627-7636,7638-7656,7658-7718,7720-7732,7734,7736,7738-7750,7754-7759,7761-7767,7769-7780,7782,7784-7809,7811-7812,7814-7835,7837-7847,7849-7887,7889-7895,7897,7899,7901,7903-7905,7907-7921,7923-7925,7927-7933,7935,7937-7952,7954-7968,7970-7974,7976,7978-7979,7981-7982,7984-7988,7990-7992,7994-8041,8043-8066,8068-8087,8089,8091-8108,8110-8124,8126-8129,8131,8133-8150,8152-8154,8156-8162,8164-8167,8169-8170,8172-8179,8181,8183-8196,8198-8207,8209-8211,8213-8214,8216-8217,8219-8220,8222,8224-8225,8227-8247,8249,8251,8253-8282,8284-8352,8354-8368,8370-8396,8398-8430,8432,8434-8440,8442-8445,8447-8453,8455-8456,8458,8460,8462-8464,8466-8473,8475-8479,8481,8483-8501,8503-8523,8525,8527-8531,8533,8535-8536,8538-8550,8552-8554,8556-8557,8559-8579,8581-8587,8589,8591-8592,8594-8595,8597-8601,8603-8610,8612-8613,8615,8617,8619-8645,8647-8650,8652-8661,8663-8666,8668-8669,8671-8683,8685-8691,8693-8730,8732-8737,8739,8741-8767,8769,8771-8772,8774,8776-8797,8799-8812,8814-8819,8821,8823-8833,8835-8837,8839,8841,8843-8849,8852-8858,8860-8867,8869-8870,8872,8874-8877,8879,8881,8883-8888,8890,8892-8901,8903-8911,8913-8917,8920-8923,8925-8933,8935-8938,8940-8943,8945,8947-8948,8950,8952-8953,8955-8962,8964,8966,8968-8970,8972-8975,8977-8983,8985-8993,8995-9001,9003,9005,9007,9009,9011-9019,9021-9023,9025,9027-9028,9030-9044,9046-9047,9049-9050,9052-9056,9058-9059,9061,9063-9064,9066-9068,9071-9092,9094-9112,9114-9117,9119,9121-9160,9162-9166,9169-9207,9209-9211,9213-9215,9217,9219,9221-9253,9255,9257,9259-9260,9262,9264-9269,9271-9273,9275,9277-9278,9280,9282-9283,9285-9289,9291-9299,9301-9310,9312-9313,9315-9320,9322-9324,9326-9338,9340-9342,9344,9346-9348,9350-9358
+
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499,7501-7502,7504,7506-7507,7509-7511,7513-7517,7519-7521,7523,7525,7527-7529,7531,7533,7535-7538,7540-7542,7544-7549,7551-7552,7554-7561,7563,7565,7567-7573,7575-7578,7580-7584,7586-7591,7593-7624,7627-7636,7638-7656,7658-7718,7720-7732,7734,7736,7738-7750,7754-7759,7761-7767,7769-7780,7782,7784-7809,7811-7812,7814-7835,7837-7847,7849-7887,7889-7895,7897,7899,7901,7903-7905,7907-7921,7923-7925,7927-7933,7935,7937-7952,7954-7968,7970-7974,7976,7978-7979,7981-7982,7984-7988,7990-7992,7994-8041,8043-8066,8068-8087,8089,8091-8108,8110-8124,8126-8129,8131,8133-8150,8152-8154,8156-8162,8164-8167,8169-8170,8172-8179,8181,8183-8196,8198-8207,8209-8211,8213-8214,8216-8217,8219-8220,8222,8224-8225,8227-8247,8249,8251,8253-8282,8284-8352,8354-8368,8370-8396,8398-8430,8432,8434-8440,8442-8445,8447-8453,8455-8456,8458,8460,8462-8464,8466-8473,8475-8479,8481,8483-8501,8503-8523,8525,8527-8531,8533,8535-8536,8538-8550,8552-8554,8556-8557,8559-8579,8581-8587,8589,8591-8592,8594-8595,8597-8601,8603-8610,8612-8613,8615,8617,8619-8645,8647-8650,8652-8661,8663-8666,8668-8669,8671-8683,8685-8691,8693-8730,8732-8737,8739,8741-8767,8769,8771-8772,8774,8776-8797,8799-8812,8814-8819,8821,8823-8833,8835-8837,8839,8841,8843-8849,8852-8858,8860-8867,8869-8870,8872,8874-8877,8879,8881,8883-8888,8890,8892-8901,8903-8911,8913-8917,8920-8923,8925-8933,8935-8938,8940-8943,8945,8947-8948,8950,8952-8953,8955-8962,8964,8966,8968-8970,8972-8975,8977-8983,8985-8993,8995-9001,9003,9005,9007,9009,9011-9019,9021-9023,9025,9027-9028,9030-9044,9046-9047,9049-9050,9052-9056,9058-9059,9061,9063-9064,9066-9068,9071-9092,9094-9112,9114-9117,9119,9121-9160,9162-9166,9169-9207,9209-9211,9213-9215,9217,9219,9221-9253,9255,9257,9259-9260,9262,9264-9269,9271-9273,9275,9277-9278,9280,9282-9283,9285-9289,9291-9299,9301-9310,9312-9313,9315-9320,9322-9324,9326-9338,9340-9342,9344,9346-9348,9350-9358,9360-9362
Modified: branches/Version-1_0-branch/controller/inc/class.uicalendar.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.uicalendar.inc.php
2012-05-10 13:55:15 UTC (rev 9362)
+++ branches/Version-1_0-branch/controller/inc/class.uicalendar.inc.php
2012-05-10 13:56:59 UTC (rev 9363)
@@ -132,13 +132,13 @@
'my_locations' =>
$my_locations,
'view_location_code' => $location_code,
'property_array' =>
$property_array,
- 'location_array' =>
$location_array,
+ 'current_location' =>
$location_array,
'heading_array' =>
month_calendar::get_heading_array($year, $month),
'controls_calendar_array' =>
$controls_calendar_array,
'date_format' =>
$date_format,
- 'period' =>
month_calendar::get_month_name($month-1),
- 'month_nr' =>
$month,
- 'year' =>
$year,
+ 'current_month' =>
month_calendar::get_month_name($month-1),
+ 'current_year' => $year,
+ 'current_month_nr' => $month
);
self::add_javascript('controller', 'controller',
'jquery.js');
@@ -240,12 +240,11 @@
(
'my_locations' =>
$my_locations,
'view_location_code' => $location_code,
- 'location_array' =>
$location_array,
+ 'current_location' => $location_array,
'heading_array' =>
$heading_array,
'controls_calendar_array' =>
$controls_calendar_array,
'date_format' =>
$date_format,
- 'period' =>
$year,
- 'year' =>
$year
+ 'current_year' => $year,
);
self::render_template_xsl(
array('calendar/view_calendar_year', 'calendar/check_list_status_checker',
'calendar/icon_color_map'), $data);
Modified:
branches/Version-1_0-branch/controller/inc/component/class.year_calendar.inc.php
===================================================================
---
branches/Version-1_0-branch/controller/inc/component/class.year_calendar.inc.php
2012-05-10 13:55:15 UTC (rev 9362)
+++
branches/Version-1_0-branch/controller/inc/component/class.year_calendar.inc.php
2012-05-10 13:56:59 UTC (rev 9363)
@@ -70,7 +70,7 @@
$status = "CONTROLS_DONE_WITH_ERRORS";
$this->calendar_array[$status_agg_month_info->get_month_nr()]["status"] =
$status;
-
$this->calendar_array[$status_agg_month_info->get_month_nr()]["info"] =
$status_agg_month_info->get_agg_open_cases();
+
$this->calendar_array[$status_agg_month_info->get_month_nr()]["info"]["agg_open_errors"]
= $status_agg_month_info->get_agg_open_cases();
}
return $this->calendar_array;
Modified:
branches/Version-1_0-branch/controller/templates/base/calendar/check_list_status_checker.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/calendar/check_list_status_checker.xsl
2012-05-10 13:55:15 UTC (rev 9362)
+++
branches/Version-1_0-branch/controller/templates/base/calendar/check_list_status_checker.xsl
2012-05-10 13:56:59 UTC (rev 9363)
@@ -116,15 +116,21 @@
<div id="info_box"></div>
<a class="view_info_box">
<xsl:attribute
name="href">
-
<xsl:text>index.php?menuaction=controller.uicheck_list.edit_check_list</xsl:text>
-
<xsl:text>&check_list_id=</xsl:text>
- <xsl:value-of
select="info/check_list_id"/>
+
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_month</xsl:text>
+
<xsl:text>&control_id=</xsl:text>
+ <xsl:value-of
select="//control/id"/>
+
<xsl:text>&location_code=</xsl:text>
+ <xsl:value-of
select="//current_location/location_code"/>
+
<xsl:text>&year=</xsl:text>
+ <xsl:value-of
select="//current_year"/>
+
<xsl:text>&month=</xsl:text>
+ <xsl:number />
</xsl:attribute>
<span
style="display:none">
<xsl:text>&check_list_id=</xsl:text><xsl:value-of
select="info/check_list_id"/>
<xsl:text>&phpgw_return_as=json</xsl:text>
</span>
- <xsl:value-of
select="info"/>
+ <xsl:value-of
select="info/agg_open_errors"/>
</a>
</div>
</td>
Modified:
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_month.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_month.xsl
2012-05-10 13:55:15 UTC (rev 9362)
+++
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_month.xsl
2012-05-10 13:56:59 UTC (rev 9363)
@@ -7,8 +7,8 @@
<div id="main_content">
<div id="control_plan">
<div class="top">
- <h1><xsl:value-of
select="location_array/loc1_name"/></h1>
- <h3>Kalenderoversikt for <xsl:value-of
select="period"/><span class="year"><xsl:value-of select="year"/></span></h3>
+ <h1>Kontrollplan for bygg/eiendom: <xsl:value-of
select="current_location/loc1_name"/></h1>
+ <h3>Kalenderoversikt for <xsl:value-of
select="current_month"/><span class="year"><xsl:value-of
select="current_year"/></span></h3>
<form action="#">
<input type="hidden" name="period_type"
value="view_year" />
@@ -52,6 +52,30 @@
</xsl:attribute>
Årsoversikt
</a>
+ <a style="display:block;font-weight: bold;font-size:
14px;float:left;">
+ <xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_year</xsl:text>
+ <xsl:text>&year=</xsl:text>
+ <xsl:value-of select="current_year"/>
+ <xsl:text>&month=</xsl:text>
+ <xsl:value-of select="current_month -
1"/>
+ <xsl:text>&location_code=</xsl:text>
+ <xsl:value-of select="$location_code"/>
+ </xsl:attribute>
+ <xsl:value-of select="current_month"/>
+ </a>
+ <a style="display:block;font-weight: bold;font-size:
14px;float:left;">
+ <xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_year</xsl:text>
+ <xsl:text>&year=</xsl:text>
+ <xsl:value-of select="current_year"/>
+ <xsl:text>&month=</xsl:text>
+ <xsl:value-of select="current_month +
1"/>
+ <xsl:text>&location_code=</xsl:text>
+ <xsl:value-of select="$location_code"/>
+ </xsl:attribute>
+ <xsl:value-of select="current_month + 1"/>
+ </a>
<!--
<select id="loc_1" class="choose_loc">
<xsl:for-each select="property_array">
@@ -106,8 +130,19 @@
</td>
<td class="frequency">
<span>
- <xsl:value-of
select="control/repeat_type_label"/>
- <xsl:value-of
select="control/repeat_interval"/>
+ <xsl:choose>
+ <xsl:when
test="control/repeat_interval = 1">
+ <span
class="pre">Hver</span>
+ </xsl:when>
+ <xsl:when
test="control/repeat_interval = 2">
+ <span
class="pre">Annenhver</span>
+ </xsl:when>
+ <xsl:when
test="control/repeat_interval > 2">
+ <span
class="pre">Hver</span><span><xsl:value-of
select="control/repeat_interval"/>.</span>
+ </xsl:when>
+ </xsl:choose>
+
+ <span
class="val"><xsl:value-of select="control/repeat_type_label"/></span>
</span>
</td>
Modified:
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_month_for_locations.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_month_for_locations.xsl
2012-05-10 13:55:15 UTC (rev 9362)
+++
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_month_for_locations.xsl
2012-05-10 13:56:59 UTC (rev 9363)
@@ -1,14 +1,14 @@
<!-- $Id: view_calendar_year.xsl 9206 2012-04-23 06:21:38Z vator $ -->
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
<xsl:variable name="date_format">d/m-Y</xsl:variable>
-<xsl:variable name="year"><xsl:value-of select="year"/></xsl:variable>
+<xsl:variable name="current_year"><xsl:value-of
select="current_year"/></xsl:variable>
+<xsl:variable name="current_month"><xsl:value-of
select="current_month"/></xsl:variable>
<div id="main_content">
-
<div id="control_plan">
<div class="top">
<h1>Kontrollplan for <xsl:value-of
select="control/title"/></h1>
- <h3>Periode: <xsl:value-of select="period"/></h3>
+ <h3>Periode: <xsl:value-of select="$current_year"/></h3>
<form action="#">
<input type="hidden" name="period_type"
value="view_year" />
@@ -41,6 +41,18 @@
</xsl:attribute>
Årsoversikt
</a>
+ <a style="display:block;font-weight: bold;font-size:
14px;float:left;">
+ <xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_month_for_locations</xsl:text>
+ <xsl:text>&year=</xsl:text>
+ <xsl:value-of select="current_year"/>
+ <xsl:text>&month=</xsl:text>
+ <xsl:value-of select="current_month"/>
+ <xsl:text>&control_id=</xsl:text>
+ <xsl:value-of select="control/id"/>
+ </xsl:attribute>
+ Årsoversikt
+ </a>
</div>
<div id="cal_wrp">
<table id="calendar" class="month">
Modified:
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_year.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_year.xsl
2012-05-10 13:55:15 UTC (rev 9362)
+++
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_year.xsl
2012-05-10 13:56:59 UTC (rev 9363)
@@ -8,8 +8,8 @@
<div id="control_plan">
<div class="top">
- <h1>Kontrollplan for <xsl:value-of
select="location_array/loc1_name"/></h1>
- <h3 style="margin:0;font-size:19px;">Periode:
<xsl:value-of select="period"/></h3>
+ <h1>Kontrollplan for bygg/eiendom: <xsl:value-of
select="current_location/loc1_name"/></h1>
+ <h3>Kalenderoversikt for <span
class="year"><xsl:value-of select="current_year"/></span></h3>
<form action="#">
<input type="hidden" name="period_type"
value="view_year" />
@@ -56,7 +56,7 @@
<xsl:attribute
name="href">
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_month</xsl:text>
<xsl:text>&year=</xsl:text>
-
<xsl:value-of select="$year"/>
+
<xsl:value-of select="//current_year"/>
<xsl:text>&location_code=</xsl:text>
<xsl:value-of select="$view_location_code"/>
<xsl:text>&month=</xsl:text>
@@ -90,7 +90,21 @@
<span><xsl:value-of
select="control/responsibility_name"/></span>
</td>
<td class="frequency">
- <span><xsl:value-of
select="control/repeat_type_label"/></span>
+ <span>
+ <xsl:choose>
+
<xsl:when test="control/repeat_interval = 1">
+
<span class="pre">Hver</span>
+
</xsl:when>
+
<xsl:when test="control/repeat_interval = 2">
+
<span class="pre">Annenhver</span>
+
</xsl:when>
+
<xsl:when test="control/repeat_interval > 2">
+
<span class="pre">Hver</span><span><xsl:value-of
select="control/repeat_interval"/>.</span>
+
</xsl:when>
+ </xsl:choose>
+
+ <span
class="val"><xsl:value-of select="control/repeat_type_label"/></span>
+ </span>
</td>
<xsl:for-each
select="calendar_array">
<xsl:call-template name="check_list_status_checker" >
Modified:
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_year_for_locations.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_year_for_locations.xsl
2012-05-10 13:55:15 UTC (rev 9362)
+++
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_year_for_locations.xsl
2012-05-10 13:56:59 UTC (rev 9363)
@@ -46,7 +46,7 @@
<xsl:attribute
name="href">
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_month_for_locations</xsl:text>
<xsl:text>&year=</xsl:text>
-
<xsl:value-of select="$year"/>
+
<xsl:value-of select="$current_year"/>
<xsl:text>&month=</xsl:text>
<xsl:number/>
<xsl:text>&control_id=</xsl:text>
Modified: branches/Version-1_0-branch/controller/templates/base/css/base.css
===================================================================
--- branches/Version-1_0-branch/controller/templates/base/css/base.css
2012-05-10 13:55:15 UTC (rev 9362)
+++ branches/Version-1_0-branch/controller/templates/base/css/base.css
2012-05-10 13:56:59 UTC (rev 9363)
@@ -980,17 +980,19 @@
padding: 0 10px;
width: 100px;
}
-
-#calendar .title, #calendar .location_name {
- text-align: left;
-}
-#calendar .heading .title {
- text-align: center;
-}
#calendar .frequency {
margin-right: 10px;
width: 65px;
}
+#calendar .frequency, #calendar .title, #calendar .assigned, #calendar
.location_name {
+ text-align: left;
+}
+#calendar .frequency .pre {
+ margin-right: 3px;
+}
+#calendar .frequency .val {
+ text-transform: lowercase;
+}
.cal_info_msg {
font-size: 16px;
padding: 40px 20px;
Modified: branches/Version-1_0-branch/property/inc/class.soinvoice.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.soinvoice.inc.php
2012-05-10 13:55:15 UTC (rev 9362)
+++ branches/Version-1_0-branch/property/inc/class.soinvoice.inc.php
2012-05-10 13:56:59 UTC (rev 9363)
@@ -2180,8 +2180,8 @@
if( stripos($data['supervisor_lid'],'*') === 0)
{
$data['supervisor_lid'] =
ltrim($data['supervisor_lid'],'*');
- $filtermethod .= " $where
oppsynsigndato IS NOT NULL AND saksigndato IS NULL";
- $where = 'AND';
+ // $filtermethod .= " $where
oppsynsigndato IS NOT NULL AND saksigndato IS NULL";
+ // $where = 'AND';
}
$filtermethod .= " $where saksbehandlerid =
'{$data['supervisor_lid']}'";
Modified: branches/Version-1_0-branch/property/inc/class.uiwo_hour.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uiwo_hour.inc.php
2012-05-10 13:55:15 UTC (rev 9362)
+++ branches/Version-1_0-branch/property/inc/class.uiwo_hour.inc.php
2012-05-10 13:56:59 UTC (rev 9363)
@@ -1445,17 +1445,28 @@
{
if(isset($this->config->config_data['invoice_acl']) &&
$this->config->config_data['invoice_acl'] == 'dimb')
{
- $approve_role =
execMethod('property.boinvoice.check_role', $project['ecodimb'] ?
$project['ecodimb'] : $workorder['ecodimb']);
- if(!$approve_role['is_supervisor'] && !
$approve_role['is_budget_responsible'] && !$workorder['approved'])
+ $approve_role =
execMethod('property.boinvoice.check_role', $project['ecodimb'] ?
$project['ecodimb'] : $workorder['workorder']['ecodimb']);
+
+ $_ok = false;
+ if($approve_role['is_supervisor'])
{
- phpgwapi_cache::message_set(
lang('you are not approved for this dimb: %1', $project['ecodimb'] ?
$project['ecodimb'] : $workorder['ecodimb'] ), 'error' );
-
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
'property.uiwo_hour.view', 'workorder_id'=> $workorder_id, 'from' =>
phpgw::get_var('from')));
+ $_ok = true;
}
- if(!$workorder['approved'])
+ else if(
$approve_role['is_budget_responsible'] )
{
+ $_ok = true;
+ }
+ else if( $workorder['approved'] )
+ {
+ $_ok = true;
+ }
+
+ if(!$_ok)
+ {
phpgwapi_cache::message_set(
lang('order is not approved'), 'error' );
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
'property.uiwo_hour.view', 'workorder_id'=> $workorder_id, 'from' =>
phpgw::get_var('from')));
}
+ unset($_ok);
}
$_to = isset($workorder['mail_recipients'][0])
&& $workorder['mail_recipients'][0] ? implode(';',
$workorder['mail_recipients']) : $to_email;
@@ -1887,16 +1898,27 @@
if(isset($this->config->config_data['invoice_acl']) &&
$this->config->config_data['invoice_acl'] == 'dimb')
{
$approve_role =
execMethod('property.boinvoice.check_role', $project['ecodimb'] ?
$project['ecodimb'] : $common_data['workorder']['ecodimb']);
- if(!$approve_role['is_supervisor'] && !
$approve_role['is_budget_responsible'] && !$workorder['approved'])
+
+ $_ok = false;
+ if($approve_role['is_supervisor'])
{
- phpgwapi_cache::message_set( lang('you
are not approved for this dimb: %1', $project['ecodimb'] ? $project['ecodimb']
: $workorder['ecodimb'] ), 'error' );
-
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
'property.uiwo_hour.view', 'workorder_id'=> $workorder_id, 'from' =>
phpgw::get_var('from')));
+ $_ok = true;
}
- if(!$workorder['approved'])
+ else if( $approve_role['is_budget_responsible']
)
{
+ $_ok = true;
+ }
+ else if( $workorder['approved'] )
+ {
+ $_ok = true;
+ }
+
+ if(!$_ok)
+ {
phpgwapi_cache::message_set(
lang('order is not approved'), 'error' );
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
'property.uiwo_hour.view', 'workorder_id'=> $workorder_id, 'from' =>
phpgw::get_var('from')));
}
+ unset($_ok);
}
$content =
$this->_get_order_details($common_data['content'], $show_cost);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [9363] Merge 9359:9362 from trunk,
Sigurd Nes <=