[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [8611] Merge 8602:8610 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [8611] Merge 8602:8610 from trunk |
|
Date: |
Wed, 18 Jan 2012 20:12:58 +0000 |
Revision: 8611
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8611
Author: sigurdne
Date: 2012-01-18 20:12:58 +0000 (Wed, 18 Jan 2012)
Log Message:
-----------
Merge 8602:8610 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/controller/inc/class.socase.inc.php
branches/Version-1_0-branch/controller/inc/class.uicalendar.inc.php
branches/Version-1_0-branch/controller/setup/setup.inc.php
branches/Version-1_0-branch/controller/setup/tables_current.inc.php
branches/Version-1_0-branch/controller/setup/tables_update.inc.php
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_month.xsl
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_year.xsl
branches/Version-1_0-branch/controller/templates/base/check_list/view_open_cases.xsl
branches/Version-1_0-branch/controller/templates/base/css/base.css
branches/Version-1_0-branch/property/inc/class.soproject.inc.php
branches/Version-1_0-branch/property/inc/export/default/Basware_X114
branches/Version-1_0-branch/sms/inc/class.sms.inc.php
branches/Version-1_0-branch/sms/inc/class.uisms.inc.php
branches/Version-1_0-branch/sms/setup/setup.inc.php
branches/Version-1_0-branch/sms/setup/tables_update.inc.php
Added Paths:
-----------
branches/Version-1_0-branch/sms/inc/plugin/gateway/bergen_kommune/
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
+
/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
Modified: branches/Version-1_0-branch/controller/inc/class.socase.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.socase.inc.php
2012-01-18 20:10:06 UTC (rev 8610)
+++ branches/Version-1_0-branch/controller/inc/class.socase.inc.php
2012-01-18 20:12:58 UTC (rev 8611)
@@ -146,7 +146,7 @@
$values = array(
'check_item_id = ' .
$this->marshal($case->get_check_item_id(), 'int'),
- 'status = ' .
$this->marshal($case->get_status(), 'int'),
+ 'status = ' . $case->get_status(),
'location_id = ' .
$this->marshal($case->get_location_id(), 'int'),
'location_item_id = ' .
$this->marshal($case->get_location_item_id(), 'int'),
'descr = ' . $this->marshal($case->get_descr(),
'string'),
Modified: branches/Version-1_0-branch/controller/inc/class.uicalendar.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.uicalendar.inc.php
2012-01-18 20:10:06 UTC (rev 8610)
+++ branches/Version-1_0-branch/controller/inc/class.uicalendar.inc.php
2012-01-18 20:12:58 UTC (rev 8611)
@@ -107,13 +107,13 @@
$criteria = array
(
'user_id' =>
$GLOBALS['phpgw_info']['user']['account_id'],
- 'type_id' => 2,
+ 'type_id' => 1,
'role_id' => 0, // For å begrense til en
bestemt rolle - ellers listes alle roller for brukeren
'allrows' => false
);
$location_finder = new location_finder();
- $locations = $location_finder->get_responsibilities(
$criteria );
+ $my_locations = $location_finder->get_responsibilities(
$criteria );
$controls_for_location_array =
$this->so_control->get_controls_by_location($location_code, $from_date_ts,
$to_date_ts, $repeat_type);
@@ -133,6 +133,7 @@
$data = array
(
+ 'my_locations' =>
$my_locations,
'location_array' =>
$location_array,
'heading_array' =>
$heading_array,
'controls_calendar_array' =>
$controls_calendar_array,
@@ -185,8 +186,7 @@
);
$location_finder = new location_finder();
- $locations = $location_finder->get_responsibilities(
$criteria );
-
+ $my_locations = $location_finder->get_responsibilities(
$criteria );
$repeat_type = null;
$controls_for_location_array =
$this->so_control->get_controls_by_location($location_code, $from_date_ts,
$to_date_ts, $repeat_type );
@@ -246,6 +246,7 @@
$data = array
(
+ 'my_locations' =>
$my_locations,
'location_array' =>
$location_array,
'heading_array' =>
$heading_array,
'controls_calendar_array' =>
$controls_calendar_array,
Modified: branches/Version-1_0-branch/controller/setup/setup.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/setup/setup.inc.php 2012-01-18
20:10:06 UTC (rev 8610)
+++ branches/Version-1_0-branch/controller/setup/setup.inc.php 2012-01-18
20:12:58 UTC (rev 8611)
@@ -1,6 +1,6 @@
<?php
$setup_info['controller']['name'] = 'controller';
- $setup_info['controller']['version'] = '0.1.20';
+ $setup_info['controller']['version'] = '0.1.21';
$setup_info['controller']['app_order'] = 100;
$setup_info['controller']['enable'] = 1;
$setup_info['controller']['app_group'] = 'office';
@@ -47,5 +47,8 @@
'controller_control_area',
'controller_control_group_list',
'controller_control_location_list',
- 'controller_control_component_list'
+ 'controller_control_component_list',
+ 'controller_document',
+ 'controller_document_types',
+ 'controller_check_item_case'
);
Modified: branches/Version-1_0-branch/controller/setup/tables_current.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/setup/tables_current.inc.php
2012-01-18 20:10:06 UTC (rev 8610)
+++ branches/Version-1_0-branch/controller/setup/tables_current.inc.php
2012-01-18 20:12:58 UTC (rev 8611)
@@ -144,7 +144,7 @@
'fd' => array(
'id' => array('type' => 'auto', 'nullable' =>
false),
'control_id' => array('type' => 'int',
'precision' => '4', 'nullable' => false),
- 'location_code' => array('type' =>
'int', 'precision' => '4', 'nullable' => false)
+ 'location_code' => array('type' =>
'varchar', 'precision' => '30', 'nullable' => false)
),
'pk' => array('id'),
'fk' => array(),
@@ -189,7 +189,7 @@
'ix' => array(),
'uc' => array()
),
- 'controller_check_item_case', array(
+ 'controller_check_item_case' => array(
'fd' => array(
'id' => array('type' =>
'auto', 'nullable' => false),
'check_item_id' => array('type' =>
'int', 'precision' => '4', 'nullable' => false),
@@ -207,4 +207,4 @@
'ix' => array(),
'uc' => array()
)
- );
\ No newline at end of file
+ );
Modified: branches/Version-1_0-branch/controller/setup/tables_update.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/setup/tables_update.inc.php
2012-01-18 20:10:06 UTC (rev 8610)
+++ branches/Version-1_0-branch/controller/setup/tables_update.inc.php
2012-01-18 20:12:58 UTC (rev 8611)
@@ -428,4 +428,25 @@
$GLOBALS['setup_info']['controller']['currentver'] = '0.1.20';
return $GLOBALS['setup_info']['controller']['currentver'];
- }
\ No newline at end of file
+ }
+
+ $test[] = '0.1.20';
+ function controller_upgrade0_1_20()
+ {
+
+ $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+ //Drop and reinsert because og the datatype int can't be
altered to varchar
+
$GLOBALS['phpgw_setup']->oProc->DropColumn('controller_control_location_list',
array(), 'location_code');
+
+
$GLOBALS['phpgw_setup']->oProc->AddColumn('controller_control_location_list','location_code',array(
+ 'type' => 'varchar',
+ 'precision' => 30,
+ 'nullable' => false
+ ));
+
+ if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+ {
+ $GLOBALS['setup_info']['controller']['currentver'] =
'0.1.21';
+ return
$GLOBALS['setup_info']['controller']['currentver'];
+ }
+ }
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-01-18 20:10:06 UTC (rev 8610)
+++
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_month.xsl
2012-01-18 20:12:58 UTC (rev 8611)
@@ -9,17 +9,26 @@
<h1><xsl:value-of
select="location_array/loc1_name"/></h1>
<h3 style="margin:0;font-size:19px;">Kalenderoversikt
for <xsl:value-of select="period"/></h3>
</div>
+
+ <div style="float:right;width:300px;margin-top:40px;">
+ <select id="my_location_id">
+ <xsl:for-each select="my_locations">
+ <option value="{location_code}"
selected="selected">
+ <xsl:value-of
disable-output-escaping="yes" select="loc1_name"/>
+ </option>
+ </xsl:for-each>
+ </select>
+ <ul id="icon_color_map">
+ <li><img height="15"
src="controller/images/status_icon_yellow_ring.png" /><span>Kontroll satt
opp</span></li>
+ <li><img height="15"
src="controller/images/status_icon_yellow.png" /><span>Kontroll har planlagt
dato</span></li>
+ <li><img height="15"
src="controller/images/status_icon_dark_green.png" /><span>Kontroll gjennomført
uten feil før frist</span></li>
+ <li><img height="15"
src="controller/images/status_icon_light_green.png" /><span>Kontroll
gjennomført uten feil etter frist</span></li>
+ <li><img height="15"
src="controller/images/status_icon_red_empty.png" /><span>Kontroll gjennomført
med rapporterte feil</span></li>
+ <li><img height="15"
src="controller/images/status_icon_red_cross.png" /><span>Kontroll ikke
gjennomført</span></li>
+ </ul>
+ </div>
-
- <ul id="icon_color_map">
- <li><img height="15"
src="controller/images/status_icon_yellow_ring.png" /><span>Kontroll satt
opp</span></li>
- <li><img height="15"
src="controller/images/status_icon_yellow.png" /><span>Kontroll har planlagt
dato</span></li>
- <li><img height="15"
src="controller/images/status_icon_dark_green.png" /><span>Kontroll gjennomført
uten feil før frist</span></li>
- <li><img height="15"
src="controller/images/status_icon_light_green.png" /><span>Kontroll
gjennomført uten feil etter frist</span></li>
- <li><img height="15"
src="controller/images/status_icon_red_empty.png" /><span>Kontroll gjennomført
med rapporterte feil</span></li>
- <li><img height="15"
src="controller/images/status_icon_red_cross.png" /><span>Kontroll ikke
gjennomført</span></li>
- </ul>
-
+ <div id="cal_wrp">
<div style="float: left;margin-bottom: 10px;margin-left:
735px;margin-top: 30px;"><a class="move_cal_right" href="#"><img
src="controller/images/arrow_left.png" width="16"/></a></div>
<div style="float:left;margin-top: 30px;margin-left: 374px;"><a
class="move_cal_left" href="#"><img src="controller/images/arrow_right.png"
width="16"/></a></div>
@@ -241,5 +250,6 @@
</xsl:choose>
</ul>
</div>
+ </div>
</div>
</xsl:template>
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-01-18 20:10:06 UTC (rev 8610)
+++
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_year.xsl
2012-01-18 20:12:58 UTC (rev 8611)
@@ -10,16 +10,25 @@
<h1><xsl:value-of
select="location_array/loc1_name"/></h1>
<h3 style="margin:0;font-size:19px;">Kalenderoversikt
for <xsl:value-of select="period"/></h3>
</div>
+
+ <div style="float:right;width:300px;margin-top:40px;">
+ <select id="my_location_id">
+ <xsl:for-each select="my_locations">
+ <option value="{location_code}"
selected="selected">
+ <xsl:value-of
disable-output-escaping="yes" select="loc1_name"/>
+ </option>
+ </xsl:for-each>
+ </select>
+ <ul id="icon_color_map">
+ <li><img height="15"
src="controller/images/status_icon_yellow_ring.png" /><span>Kontroll satt
opp</span></li>
+ <li><img height="15"
src="controller/images/status_icon_yellow.png" /><span>Kontroll har planlagt
dato</span></li>
+ <li><img height="15"
src="controller/images/status_icon_dark_green.png" /><span>Kontroll gjennomført
uten feil før frist</span></li>
+ <li><img height="15"
src="controller/images/status_icon_light_green.png" /><span>Kontroll
gjennomført uten feil etter frist</span></li>
+ <li><img height="15"
src="controller/images/status_icon_red_empty.png" /><span>Kontroll gjennomført
med rapporterte feil</span></li>
+ <li><img height="15"
src="controller/images/status_icon_red_cross.png" /><span>Kontroll ikke
gjennomført</span></li>
+ </ul>
+ </div>
- <ul id="icon_color_map">
- <li><img height="15"
src="controller/images/status_icon_yellow_ring.png" /><span>Kontroll satt
opp</span></li>
- <li><img height="15"
src="controller/images/status_icon_yellow.png" /><span>Kontroll har planlagt
dato</span></li>
- <li><img height="15"
src="controller/images/status_icon_dark_green.png" /><span>Kontroll gjennomført
uten feil før frist</span></li>
- <li><img height="15"
src="controller/images/status_icon_light_green.png" /><span>Kontroll
gjennomført uten feil etter frist</span></li>
- <li><img height="15"
src="controller/images/status_icon_red_empty.png" /><span>Kontroll gjennomført
med rapporterte feil</span></li>
- <li><img height="15"
src="controller/images/status_icon_red_cross.png" /><span>Kontroll ikke
gjennomført</span></li>
- </ul>
-
<ul class="calendar">
<xsl:choose>
<xsl:when
test="controls_calendar_array/child::node()">
@@ -79,7 +88,7 @@
</div>
<div class="months">
<xsl:for-each
select="calendar_array">
- <xsl:choose>
+ <xsl:choose>
<xsl:when test="status = 'control_registered'">
<div>
<a>
@@ -183,8 +192,7 @@
<xsl:otherwise>
<div></div>
</xsl:otherwise>
- </xsl:choose>
-
+ </xsl:choose>
</xsl:for-each>
</div>
</li>
Modified:
branches/Version-1_0-branch/controller/templates/base/check_list/view_open_cases.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/check_list/view_open_cases.xsl
2012-01-18 20:10:06 UTC (rev 8610)
+++
branches/Version-1_0-branch/controller/templates/base/check_list/view_open_cases.xsl
2012-01-18 20:12:58 UTC (rev 8611)
@@ -21,24 +21,25 @@
<ul>
<xsl:for-each select="cases_array">
<xsl:variable name="cases_id"><xsl:value-of select="id"/></xsl:variable>
-
<li><xsl:value-of select="descr"/>
+
<li><xsl:number />. <xsl:value-of select="descr"/>
<xsl:choose>
<xsl:when test="location_item_id > 0">
<div style="float:right;">
-
<a target="_blank">
-
<xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=property.uitts.view</xsl:text>
-
<xsl:text>&id=</xsl:text>
-
<xsl:value-of
select="location_item_id"/>
-
</xsl:attribute>
-
Vis melding
-
</a>
+
<a target="_blank">
+
<xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=property.uitts.view</xsl:text>
+
<xsl:text>&id=</xsl:text>
+
<xsl:value-of
select="location_item_id"/>
+
</xsl:attribute>
+
Vis melding
+
</a>
</div>
</xsl:when>
<xsl:otherwise>
<div style="float:right;"><span style="color:red">Ingen
melding registrert</span></div>
</xsl:otherwise>
</xsl:choose>
+
<div class="quick_menu"><a href="">endre</a><a href="">slette</a></div>
</li>
</xsl:for-each>
</ul>
Modified: branches/Version-1_0-branch/controller/templates/base/css/base.css
===================================================================
--- branches/Version-1_0-branch/controller/templates/base/css/base.css
2012-01-18 20:10:06 UTC (rev 8610)
+++ branches/Version-1_0-branch/controller/templates/base/css/base.css
2012-01-18 20:12:58 UTC (rev 8611)
@@ -1087,11 +1087,8 @@
}
ul#icon_color_map {
border: 1px solid #DDDDDD;
- float: right;
- margin-left: 500px;
- margin-right: 10px;
padding: 5px;
- margin-top: 55px;
+ margin-top: 40px;
}
ul#icon_color_map li {
font-size: 12px;
@@ -1233,8 +1230,7 @@
margin:10px;
}
li.check_item_cases ul li {
- list-style: disc outside none;
- margin: 5px 0 0 20px;
+ margin: 5px 0 0 0;
}
a.view_check_list{
color: #FFFFFF;
@@ -1251,4 +1247,16 @@
.cal_info_msg{
font-size: 16px;
padding: 40px 20px;
+}
+.quick_menu {
+ font-size: 12px;
+ margin-left: 10px;
+ padding: 2px;
+ text-decoration: underline;
+}
+.quick_menu a{
+ margin: 0 5px;
+}
+#cal_wrp{
+ clear:both;
}
\ No newline at end of file
Modified: branches/Version-1_0-branch/property/inc/class.soproject.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.soproject.inc.php
2012-01-18 20:10:06 UTC (rev 8610)
+++ branches/Version-1_0-branch/property/inc/class.soproject.inc.php
2012-01-18 20:12:58 UTC (rev 8611)
@@ -240,8 +240,8 @@
$uicols['classname'][] = 'rightClasss';
$uicols['sortable'][] = '';
- $cols .= ',sum(fm_workorder.combined_cost) as
combined_cost';
- $cols_return[] = 'combined_cost';
+// $cols .= ',sum(fm_workorder.combined_cost) as
combined_cost';
+// $cols_return[] = 'combined_cost';
$uicols['input_type'][] = 'text';
$uicols['name'][] =
'combined_cost';
$uicols['descr'][] =
lang('Sum workorder');
@@ -253,8 +253,8 @@
$uicols['classname'][] = 'rightClasss';
$uicols['sortable'][] = '';
- $cols .= ',(sum(fm_workorder.act_mtrl_cost) +
sum(fm_workorder.act_vendor_cost)) as actual_cost';
- $cols_return[] = 'actual_cost';
+// $cols .= ',(sum(fm_workorder.act_mtrl_cost) +
sum(fm_workorder.act_vendor_cost)) as actual_cost';
+// $cols_return[] = 'actual_cost';
$uicols['input_type'][] = 'text';
$uicols['name'][] =
'actual_cost';
$uicols['descr'][] =
lang('Actual cost');
@@ -282,7 +282,7 @@
*/
$cols.= ",$entity_table.user_id";
- $cols .= ',sum(fm_workorder.billable_hours) as
billable_hours';
+// $cols .= ',sum(fm_workorder.billable_hours) as
billable_hours';
$cols_return[] = 'billable_hours';
$joinmethod = " $this->join phpgw_accounts ON
($entity_table.coordinator = phpgw_accounts.account_id))";
@@ -291,14 +291,15 @@
$joinmethod .= " $this->join fm_project_status
ON ($entity_table.status = fm_project_status.id))";
$paranthesis .='(';
+/*
$joinmethod .= " $this->left_join fm_workorder
ON ($entity_table.id = fm_workorder.project_id))";
$paranthesis .='(';
-
+*/
//----- wo_hour_status
if($wo_hour_cat_id)
{
- $joinmethod .= " $this->join
fm_wo_hours ON (fm_workorder.id = fm_wo_hours.workorder_id))";
+ $joinmethod .= " {$this->join}
fm_wo_hours ON (fm_workorder.id = fm_wo_hours.workorder_id))";
$paranthesis .='(';
$joinmethod .= " $this->join
fm_wo_hours_category ON (fm_wo_hours.category = fm_wo_hours_category.id))";
@@ -520,6 +521,7 @@
//_debug_array($sql2);
$project_list = array();
$sql .= " $group_method";
+//_debug_array($sql . $ordermethod);
if(!$allrows)
{
$this->db->limit_query($sql .
$ordermethod,$start,__LINE__,__FILE__);
@@ -559,6 +561,26 @@
$j++;
}
+
+ foreach($project_list as &$project)
+ {
+ $project['combined_cost'] = 0;
+ $project['actual_cost'] = 0;
+ $project['billable_hours'] = 0;
+
+ if($project['project_id'])
+ {
+ $sql = 'SELECT
sum(fm_workorder.combined_cost) as combined_cost,'
+ . ' (sum(fm_workorder.act_mtrl_cost) +
sum(fm_workorder.act_vendor_cost)) as actual_cost,'
+ . ' sum(fm_workorder.billable_hours) as
billable_hours'
+ . " FROM fm_workorder WHERE project_id
= '{$project['project_id']}'";
+ $this->db->query($sql);
+ $this->db->next_record();
+ $project['combined_cost'] =
(int)$this->db->f('combined_cost');
+ $project['actual_cost'] =
(int)$this->db->f('actual_cost');
+ $project['billable_hours'] =
(int)$this->db->f('billable_hours');
+ }
+ }
return $project_list;
}
Modified: branches/Version-1_0-branch/property/inc/export/default/Basware_X114
===================================================================
--- branches/Version-1_0-branch/property/inc/export/default/Basware_X114
2012-01-18 20:10:06 UTC (rev 8610)
+++ branches/Version-1_0-branch/property/inc/export/default/Basware_X114
2012-01-18 20:12:58 UTC (rev 8611)
@@ -622,7 +622,7 @@
else
{
$periode = date('Ym',time());
- }
+ }
}
else
{
@@ -695,11 +695,12 @@
}
}
- $oRsOverfBilag = $line;
- $oRsOverfBilag['filnavn'] = $Filnavn?
basename($Filnavn) : date('d.m.Y-H:i:s', phpgwapi_datetime::user_localtime());
- $oRsOverfBilag['ordrebelop']= $line[$BelopFelt];
- $oRsOverfBilag['pmwrkord_code'] =
$line['order_id'];
- $oRsOverfBilag['bilagsnr_ut'] = $bilagsnr_ut;
+ $oRsOverfBilag
= $line;
+ $oRsOverfBilag['filnavn'] =
$Filnavn? basename($Filnavn) : date('d.m.Y-H:i:s',
phpgwapi_datetime::user_localtime());
+ $oRsOverfBilag['ordrebelop'] =
$line[$BelopFelt];
+ $oRsOverfBilag['pmwrkord_code'] =
$line['order_id'];
+ $oRsOverfBilag['bilagsnr_ut'] = $bilagsnr_ut;
+ $oRsOverfBilag['periode'] =
$periode;
//Kopier verdier til fm_ecobilagoverf
if ($download=='on' && !$this->debug)
Modified: branches/Version-1_0-branch/sms/inc/class.sms.inc.php
===================================================================
--- branches/Version-1_0-branch/sms/inc/class.sms.inc.php 2012-01-18
20:10:06 UTC (rev 8610)
+++ branches/Version-1_0-branch/sms/inc/class.sms.inc.php 2012-01-18
20:12:58 UTC (rev 8611)
@@ -469,21 +469,21 @@
while ($this->db->next_record())
{
- $gpid = "";
- $gp_code = "";
- $uid = $this->db->f('uid');
- $smslog_id = $this->db->f('smslog_id');
- $p_datetime = $this->db->f('p_datetime');
- $p_update = $this->db->f('p_update');
- $gpid = $this->db->f('p_gpid');
- // $gp_code = gpid2gpcode($gpid);
+ $gpid = "";
+ $gp_code = "";
+ $uid = $this->db->f('uid');
+ $smslog_id =
$this->db->f('smslog_id');
+ $p_datetime =
$this->db->f('p_datetime');
+ $p_update =
$this->db->f('p_update');
+ $gpid =
$this->db->f('p_gpid');
+ // $gp_code = gpid2gpcode($gpid);
+ $external_id = $this->db->f('external_id');
if($gpid)
{
$gp_code =
$GLOBALS['phpgw']->accounts->name2id($gpid);
}
-
$this->gw_set_delivery_status($gp_code,$uid,$smslog_id,$p_datetime,$p_update);
+
$this->gw_set_delivery_status($gp_code,$uid,$smslog_id,$p_datetime,$p_update,$external_id);
}
- //
$this->gw_set_delivery_status($gp_code,$uid,$smslog_id,$p_datetime,$p_update);
}
/* function execgwcustomcmd()
@@ -499,11 +499,12 @@
@include
$this->apps_path[inc]."/admin/commoncustomcmd.php";
}
-*/ function setsmsdeliverystatus($smslog_id,$uid,$p_status)
+*/ function
setsmsdeliverystatus($smslog_id,$uid,$p_status,$external_id = 0)
{
+ $external_id = (int) $external_id;
$datetime_now = $this->datetime_now();
$ok = false;
- $db_query = "UPDATE phpgw_sms_tblsmsoutgoing SET
p_update='$datetime_now',p_status='$p_status' WHERE smslog_id='$smslog_id' AND
uid='$uid'";
+ $db_query = "UPDATE phpgw_sms_tblsmsoutgoing SET
p_update='{$datetime_now}',p_status='{$p_status}', external_id = {$external_id}
WHERE smslog_id='$smslog_id' AND uid='$uid'";
$this->db->transaction_begin();
$this->db->query($db_query,__LINE__,__FILE__);
Modified: branches/Version-1_0-branch/sms/inc/class.uisms.inc.php
===================================================================
--- branches/Version-1_0-branch/sms/inc/class.uisms.inc.php 2012-01-18
20:10:06 UTC (rev 8610)
+++ branches/Version-1_0-branch/sms/inc/class.uisms.inc.php 2012-01-18
20:12:58 UTC (rev 8611)
@@ -877,7 +877,7 @@
$data = array
(
'msgbox_data' =>
$GLOBALS['phpgw']->common->msgbox($msgbox_data),
- 'menu'
=> execMethod('sms.menu.links'),
+ 'menu' =>
execMethod('sms.menu.links'),
);
$appname = lang('config');
Modified: branches/Version-1_0-branch/sms/setup/setup.inc.php
===================================================================
--- branches/Version-1_0-branch/sms/setup/setup.inc.php 2012-01-18 20:10:06 UTC
(rev 8610)
+++ branches/Version-1_0-branch/sms/setup/setup.inc.php 2012-01-18 20:12:58 UTC
(rev 8611)
@@ -10,7 +10,7 @@
*/
$setup_info['sms']['name'] = 'sms';
- $setup_info['sms']['version'] = '0.9.17.510';
+ $setup_info['sms']['version'] = '0.9.17.511';
$setup_info['sms']['app_order'] = 8;
$setup_info['sms']['enable'] = 1;
$setup_info['sms']['app_group'] = 'office';
Modified: branches/Version-1_0-branch/sms/setup/tables_update.inc.php
===================================================================
--- branches/Version-1_0-branch/sms/setup/tables_update.inc.php 2012-01-18
20:10:06 UTC (rev 8610)
+++ branches/Version-1_0-branch/sms/setup/tables_update.inc.php 2012-01-18
20:12:58 UTC (rev 8611)
@@ -425,3 +425,90 @@
return $GLOBALS['setup_info']['sms']['currentver'];
}
}
+
+ /**
+ * Update sms version from 0.9.17.510 to 0.9.17.511
+ * new to new config section
+ */
+
+ $test[] = '0.9.17.510';
+ function sms_upgrade0_9_17_510()
+ {
+ $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+
+ $custom_config =
CreateObject('admin.soconfig',$GLOBALS['phpgw']->locations->get_id('sms',
'run'));
+
+ // common
+ $receipt_section_bergen = $custom_config->add_section(array
+ (
+ 'name' => 'bergen_kommune',
+ 'descr' => 'bergen kommune SMS config-section'
+ )
+ );
+
+ $receipt = $custom_config->add_attrib(array
+ (
+ 'section_id' =>
$receipt_section_bergen['section_id'],
+ 'input_type' => 'text',
+ 'name' => 'service_url',
+ 'descr' => 'service_url'
+ )
+ );
+ $receipt = $custom_config->add_attrib(array
+ (
+ 'section_id' =>
$receipt_section_bergen['section_id'],
+ 'input_type' => 'text',
+ 'name' => 'login',
+ 'descr' => 'login'
+ )
+ );
+ $receipt = $custom_config->add_attrib(array
+ (
+ 'section_id' =>
$receipt_section_bergen['section_id'],
+ 'input_type' => 'password',
+ 'name' => 'password',
+ 'descr' => 'password'
+ )
+ );
+ $receipt = $custom_config->add_attrib(array
+ (
+ 'section_id' =>
$receipt_section_bergen['section_id'],
+ 'input_type' => 'text',
+ 'name' => 'wsdl',
+ 'descr' => 'wsdl'
+ )
+ );
+ $receipt = $custom_config->add_attrib(array
+ (
+ 'section_id' =>
$receipt_section_bergen['section_id'],
+ 'input_type' => 'text',
+ 'name' => 'proxy_host',
+ 'descr' => 'proxy_host'
+ )
+ );
+ $receipt = $custom_config->add_attrib(array
+ (
+ 'section_id' =>
$receipt_section_bergen['section_id'],
+ 'input_type' => 'text',
+ 'name' => 'proxy_port',
+ 'descr' => 'proxy_port'
+ )
+ );
+
+
+
$GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_sms_tblsmsoutgoing','external_id',
+ array
+ (
+ 'type' => 'int',
+ 'precision' => 4,
+ 'nullable' => True
+ )
+ );
+
+ if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+ {
+ $GLOBALS['setup_info']['sms']['currentver'] =
'0.9.17.511';
+ return $GLOBALS['setup_info']['sms']['currentver'];
+ }
+ }
+
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [8611] Merge 8602:8610 from trunk,
Sigurd Nes <=