[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [11283] Merge 11279:11282 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [11283] Merge 11279:11282 from trunk |
|
Date: |
Mon, 09 Sep 2013 08:44:38 +0000 |
Revision: 11283
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11283
Author: sigurdne
Date: 2013-09-09 08:44:38 +0000 (Mon, 09 Sep 2013)
Log Message:
-----------
Merge 11279:11282 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/logistic/inc/class.uirequirement.inc.php
branches/Version-1_0-branch/logistic/templates/base/allocation/assign_job.xsl
branches/Version-1_0-branch/property/inc/class.botenant_claim.inc.php
branches/Version-1_0-branch/property/inc/class.historylog.inc.php
branches/Version-1_0-branch/property/inc/class.sotenant_claim.inc.php
branches/Version-1_0-branch/property/inc/class.uitenant_claim.inc.php
branches/Version-1_0-branch/property/setup/setup.inc.php
branches/Version-1_0-branch/property/setup/tables_current.inc.php
branches/Version-1_0-branch/property/setup/tables_update.inc.php
branches/Version-1_0-branch/property/templates/base/tenant_claim.xsl
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,9360-9362,9364-9366,9368-9374,9376-9382,9384,9386,9388-9390,9392-9396,9398-9402,9404-9410,9412,9414,9416-9417,9419-9425,9427,9429-9430,9432,9434-9463,9465-9502,9504-9506,9508-9521,9523-9526,9528,9530-9537,9539,9541-9551,9553,9555-9556,9558-9578,9580-9581,9583,9585,9587,9589,9591-9624,9626-9655,9657-9700,9702-9726,9728-9729,9731-9749,9751,9753-9754,9756-9832,9834-9836,9838-9839,9841-9846,9848-9850,9852-9858,9860-9863,9865,9867,9869-9871,9873-9893,9895,9897-9912,9914-9919,9921-9928,9930-9952,9954,9956,9958-9963,9965-9993,9995-9997,9999-10001,10003-10004,10006-10007,10009-10012,10014-10031,10033-10073,10075-10107,10109-10165,10167-10210,10222-10226,10228-10311,10313-10378,10380,10382,10384-10393,10395-10478,10480-10482,10484-10494,10496-10503,10505,10507,10509-10521,10523,10525-10528,10530-10540,10542-10543,10545-10568,10570-10584,10586-10590,10592-10594,10596,10598-10599,10601-10611,10613,10615,10617-10626,10628-10636,10638,10640-10654,10656-10658,10660,10662-10672,10674,10676-10682,10684,10686,10688-10690,10692-10694,10696-10697,10699-10701,10703,10705-10706,10708-10724,10726-10731,10734,10736-10748,10750-10796,10798-10939,10941,10943,10945,10947-10953,10955,10957-10961,10963,10965-10966,10968-11001,11003-11030,11032-11034,11036,11038,11040,11042-11053,11055-11059,11061-11062,11064-11068,11070-11073,11075-11077,11079-11083,11085,11087-11088,11090-11093,11095-11108,11110-11111,11113,11115-11116,11118-11120,11122,11124-11129,11131-11132,11134,11136,11138,11140-11151,11153-11161,11163-11185,11187-11189,11191-11229,11231,11233,11235-11264,11266-11267,11269-11278
+
/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,9364-9366,9368-9374,9376-9382,9384,9386,9388-9390,9392-9396,9398-9402,9404-9410,9412,9414,9416-9417,9419-9425,9427,9429-9430,9432,9434-9463,9465-9502,9504-9506,9508-9521,9523-9526,9528,9530-9537,9539,9541-9551,9553,9555-9556,9558-9578,9580-9581,9583,9585,9587,9589,9591-9624,9626-9655,9657-9700,9702-9726,9728-9729,9731-9749,9751,9753-9754,9756-9832,9834-9836,9838-9839,9841-9846,9848-9850,9852-9858,9860-9863,9865,9867,9869-9871,9873-9893,9895,9897-9912,9914-9919,9921-9928,9930-9952,9954,9956,9958-9963,9965-9993,9995-9997,9999-10001,10003-10004,10006-10007,10009-10012,10014-10031,10033-10073,10075-10107,10109-10165,10167-10210,10222-10226,10228-10311,10313-10378,10380,10382,10384-10393,10395-10478,10480-10482,10484-10494,10496-10503,10505,10507,10509-10521,10523,10525-10528,10530-10540,10542-10543,10545-10568,10570-10584,10586-10590,10592-10594,10596,10598-10599,10601-10611,10613,10615,10617-10626,10628-10636,10638,10640-10654,10656-10658,10660,10662-10672,10674,10676-10682,10684,10686,10688-10690,10692-10694,10696-10697,10699-10701,10703,10705-10706,10708-10724,10726-10731,10734,10736-10748,10750-10796,10798-10939,10941,10943,10945,10947-10953,10955,10957-10961,10963,10965-10966,10968-11001,11003-11030,11032-11034,11036,11038,11040,11042-11053,11055-11059,11061-11062,11064-11068,11070-11073,11075-11077,11079-11083,11085,11087-11088,11090-11093,11095-11108,11110-11111,11113,11115-11116,11118-11120,11122,11124-11129,11131-11132,11134,11136,11138,11140-11151,11153-11161,11163-11185,11187-11189,11191-11229,11231,11233,11235-11264,11266-11267,11269-11278,11280-11282
Modified: branches/Version-1_0-branch/logistic/inc/class.uirequirement.inc.php
===================================================================
--- branches/Version-1_0-branch/logistic/inc/class.uirequirement.inc.php
2013-09-09 08:42:09 UTC (rev 11282)
+++ branches/Version-1_0-branch/logistic/inc/class.uirequirement.inc.php
2013-09-09 08:44:38 UTC (rev 11283)
@@ -1053,7 +1053,8 @@
'categories' =>
$categories,
'assign_requirement_json' =>
$assign_requirement_json,
'requirement_descr' =>
$requirement_descr,
- 'message'
=> $message
+ 'message'
=> $message,
+ 'priority_list' =>
array('options' => execMethod('property.botts.get_priority_list'))
);
if(count( $buildings_array ) > 0)
@@ -1117,7 +1118,7 @@
'origin_item_id' =>
$requirement->get_activity_id(),
'location_code' => $location_code,
'cat_id' =>
phpgw::get_var('message_cat_id', 'int'),
- 'priority' =>
3,//$priority, //valgfri (1-3)
+ 'priority' =>
phpgw::get_var('priority', 'int'),
'title' =>
phpgw::get_var('message_title', 'string'),
'details' =>
phpgw::get_var('message', 'string'),
'file_input_name' => 'file' // navn på
felt som inneholder fil
@@ -1153,8 +1154,7 @@
execMethod('property.interlink.add',
$interlink_data);
$allocation =
$this->so_resource_allocation->get_single($allocation_id);
-
$allocation->set_ext_location_id($location_id_ticket);
-
$allocation->set_ext_location_item_id($message_ticket_id);
+ $allocation->set_ticket_id($message_ticket_id);
$this->so_resource_allocation->store($allocation);
}
Modified:
branches/Version-1_0-branch/logistic/templates/base/allocation/assign_job.xsl
===================================================================
---
branches/Version-1_0-branch/logistic/templates/base/allocation/assign_job.xsl
2013-09-09 08:42:09 UTC (rev 11282)
+++
branches/Version-1_0-branch/logistic/templates/base/allocation/assign_job.xsl
2013-09-09 08:44:38 UTC (rev 11283)
@@ -34,57 +34,68 @@
<table>
<tr>
<td>
- <div class="row">
- <label>
- <xsl:value-of
select="php:function('lang', 'title')" />
- </label>
- <input name="message_title"
type="text" class="required" value = '{title}' size= '{title_size}'/>
- </div>
+ <div
class="row">
+ <label>
+
<xsl:value-of select="php:function('lang', 'title')" />
+ </label>
+ <input
name="message_title" type="text" class="required" value = '{title}' size=
'{title_size}'/>
+ </div>
</td>
</tr>
<tr>
<td>
-
- <!-- === CATEGORY === -->
- <div class="row">
- <label>
- <xsl:value-of
select="php:function('lang', 'category')" />
- </label>
- <select name="message_cat_id"
class="required">
- <option
value="0"><xsl:value-of select="php:function('lang', 'select')" /></option>
- <xsl:for-each
select="categories/cat_list">
- <xsl:variable
name="cat_id"><xsl:value-of select="./cat_id"/></xsl:variable>
- <option
value="{$cat_id}">
-
<xsl:value-of select="./name"/>
- </option>
- </xsl:for-each>
- </select>
- </div>
+ <!-- ===
CATEGORY === -->
+ <div
class="row">
+ <label>
+
<xsl:value-of select="php:function('lang', 'category')" />
+ </label>
+
<select name="message_cat_id" class="required">
+
<option value="0"><xsl:value-of select="php:function('lang', 'select')"
/></option>
+
<xsl:for-each select="categories/cat_list">
+
<xsl:variable name="cat_id"><xsl:value-of
select="./cat_id"/></xsl:variable>
+
<option value="{$cat_id}">
+
<xsl:value-of select="./name"/>
+
</option>
+
</xsl:for-each>
+
</select>
+ </div>
</td>
</tr>
+ <tr>
+ <td>
+ <div
class="row">
+ <label>
+
<xsl:value-of select="php:function('lang', 'Priority')"/>
+ </label>
+ <select
name="priority" >
+
<xsl:attribute name="title"><xsl:value-of select="php:function('lang',
'select')"/></xsl:attribute>
+
<xsl:apply-templates select="priority_list/options"/>
+
</select>
+ </div>
+ </td>
+ </tr>
<tr>
<td>
- <div class="row">
- <label>
- <xsl:value-of
select="php:function('lang', 'message')" />
- </label>
- <textarea name="message"
cols="60" rows="10">
- <xsl:value-of
select="message"/>
- </textarea>
- </div>
+ <div
class="row">
+ <label>
+
<xsl:value-of select="php:function('lang', 'message')" />
+ </label>
+
<textarea name="message" cols="60" rows="10">
+
<xsl:value-of select="message"/>
+
</textarea>
+ </div>
<!-- === UPLOAD FILE === -->
</td>
</tr>
<tr>
<td>
-
- <div class="row">
- <label>Filvedlegg:</label>
- <input type="file" id="file"
name="file" >
- <xsl:attribute
name="accept">image/*</xsl:attribute>
- <xsl:attribute
name="capture">camera</xsl:attribute>
- </input>
- </div>
+ <div
class="row">
+
<label>Filvedlegg:</label>
+ <input
type="file" id="file" name="file" >
+
<xsl:attribute name="accept">image/*</xsl:attribute>
+
<xsl:attribute name="capture">camera</xsl:attribute>
+ </input>
+ </div>
</td>
</tr>
</table>
@@ -99,6 +110,15 @@
</xsl:otherwise>
</xsl:choose>
</div>
-
</div>
</xsl:template>
+
+ <xsl:template match="options">
+ <option value="{id}">
+ <xsl:if test="selected != 0">
+ <xsl:attribute name="selected"
value="selected"/>
+ </xsl:if>
+ <xsl:value-of disable-output-escaping="yes"
select="name"/>
+ </option>
+ </xsl:template>
+
Modified: branches/Version-1_0-branch/property/inc/class.botenant_claim.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.botenant_claim.inc.php
2013-09-09 08:42:09 UTC (rev 11282)
+++ branches/Version-1_0-branch/property/inc/class.botenant_claim.inc.php
2013-09-09 08:44:38 UTC (rev 11283)
@@ -273,4 +273,52 @@
$this->so->delete($params);
}
}
+
+ function read_record_history($id)
+ {
+ $historylog =
CreateObject('property.historylog','tenant_claim');
+ $history_array =
$historylog->return_array(array('O'),array(),'','',$id);
+
+ $status_text = array();
+
+ $status_text['ready'] = lang('ready for processing
claim');
+ $status_text['open'] = lang('open');
+ $status_text['closed'] = lang('closed');
+
+ $i=0;
+ foreach ($history_array as $value)
+ {
+
+ $record_history[$i]['value_date'] =
$GLOBALS['phpgw']->common->show_date($value['datetime']);
+ $record_history[$i]['value_user'] =
$value['owner'];
+
+ switch ($value['status'])
+ {
+ case 'S': $type = lang('Status
changed'); break;
+ default:
+ }
+
+
if($value['new_value']=='O'){$value['new_value']=lang('Opened');}
+
if($value['new_value']=='X'){$value['new_value']=lang('Closed');}
+
+ $record_history[$i]['value_action'] = $type
? $type:'';
+ unset($type);
+
+ if ($value['status'] == 'S')
+ {
+ $record_history[$i]['value_new_value']
= $status_text[$value['new_value']];
+ $record_history[$i]['value_old_value']
= $status_text[$value['old_value']];
+ }
+ else
+ {
+ $record_history[$i]['value_new_value']
= '';
+ }
+
+ $i++;
+ }
+
+ return $record_history;
+ }
+
+
}
Modified: branches/Version-1_0-branch/property/inc/class.historylog.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.historylog.inc.php
2013-09-09 08:42:09 UTC (rev 11282)
+++ branches/Version-1_0-branch/property/inc/class.historylog.inc.php
2013-09-09 08:44:38 UTC (rev 11283)
@@ -99,6 +99,10 @@
$this->attrib_id_field =
',history_attrib_id';
$this->detail_id_field =
',history_detail_id';
break;
+ case 'tenant_claim':
+ $this->table='fm_tenant_claim_history';
+ break;
+
}
$this->appname = $appname;
Modified: branches/Version-1_0-branch/property/inc/class.sotenant_claim.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.sotenant_claim.inc.php
2013-09-09 08:42:09 UTC (rev 11282)
+++ branches/Version-1_0-branch/property/inc/class.sotenant_claim.inc.php
2013-09-09 08:44:38 UTC (rev 11283)
@@ -277,8 +277,17 @@
function edit($claim)
{
+ $historylog =
CreateObject('property.historylog','tenant_claim');
+
$this->db->transaction_begin();
+ $this->db->query("select status from fm_tenant_claim
where id=" . (int)$claim['claim_id'],__LINE__,__FILE__);
+ $this->db->next_record();
+
+ $old_status =
$this->db->f('status');
+
+
+
$claim['name'] =
$this->db->db_addslashes($claim['name']);
$claim['amount'] =
str_replace(",",".",$claim['amount']);
@@ -294,10 +303,15 @@
$value_set =
$this->db->validate_update($value_set);
- $this->db->query("UPDATE fm_tenant_claim set $value_set
WHERE id=" . (int)$claim['claim_id'],__LINE__,__FILE__);
+ $claim_id = (int)$claim['claim_id'];
+ $this->db->query("UPDATE fm_tenant_claim set
{$value_set} WHERE id={$claim_id}",__LINE__,__FILE__);
- $claim_id = $claim['claim_id'];
+ if($old_status != $claim['status'])
+ {
+ $historylog->add('S', $claim_id,
$claim['status'], $old_status);
+ }
+
$this->interlink->delete_from_target('property',
'.tenant_claim', $claim_id, $this->db);
$this->db->query("UPDATE fm_workorder set claim_issued
= NULL WHERE project_id = {$claim['project_id']}" ,__LINE__,__FILE__);
Modified: branches/Version-1_0-branch/property/inc/class.uitenant_claim.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uitenant_claim.inc.php
2013-09-09 08:42:09 UTC (rev 11282)
+++ branches/Version-1_0-branch/property/inc/class.uitenant_claim.inc.php
2013-09-09 08:44:38 UTC (rev 11283)
@@ -843,6 +843,39 @@
array('key' =>
'selected','label'=>'select', 'sortable'=>false,'resizeable'=>false)))
);
+
+ if($claim_id)
+ {
+ $record_history =
$this->bo->read_record_history($claim_id);
+//_debug_array($content_budget);die();
+ }
+ else
+ {
+ $record_history = array();
+ }
+
+ $datavalues[1] = array
+ (
+ 'name'
=> "1",
+ 'values'
=> json_encode($record_history),
+ 'total_records' =>
count($record_history),
+ 'edit_action' => "''",
+ 'is_paginator' => 0,
+ 'footer'
=> 0
+ );
+
+ $myColumnDefs[1] = array
+ (
+ 'name' => "1",
+ 'values' =>
json_encode(array( array('key' => 'value_date','label' =>
lang('Date'),'sortable'=>true,'resizeable'=>true),
+
array('key' => 'value_user','label' =>
lang('User'),'Action'=>true,'resizeable'=>true),
+
array('key' => 'value_action','label' =>
lang('Action'),'sortable'=>true,'resizeable'=>true),
+
array('key' => 'value_old_value','label' =>
lang('old value'), 'sortable'=>true,'resizeable'=>true),
+
array('key' => 'value_new_value','label' =>
lang('New Value'),'sortable'=>true,'resizeable'=>true)))
+ );
+
+
+
$data = array
(
'table_header_workorder'
=> $table_header_workorder,
Modified: branches/Version-1_0-branch/property/setup/setup.inc.php
===================================================================
--- branches/Version-1_0-branch/property/setup/setup.inc.php 2013-09-09
08:42:09 UTC (rev 11282)
+++ branches/Version-1_0-branch/property/setup/setup.inc.php 2013-09-09
08:44:38 UTC (rev 11283)
@@ -12,7 +12,7 @@
*/
$setup_info['property']['name'] = 'property';
- $setup_info['property']['version'] = '0.9.17.669';
+ $setup_info['property']['version'] = '0.9.17.670';
$setup_info['property']['app_order'] = 8;
$setup_info['property']['enable'] = 1;
$setup_info['property']['app_group'] = 'office';
@@ -192,6 +192,7 @@
'fm_cron_log',
'fm_tenant_claim',
'fm_tenant_claim_category',
+ 'fm_tenant_claim_history',
'fm_budget_basis',
'fm_budget',
'fm_budget_period',
Modified: branches/Version-1_0-branch/property/setup/tables_current.inc.php
===================================================================
--- branches/Version-1_0-branch/property/setup/tables_current.inc.php
2013-09-09 08:42:09 UTC (rev 11282)
+++ branches/Version-1_0-branch/property/setup/tables_current.inc.php
2013-09-09 08:44:38 UTC (rev 11283)
@@ -1801,6 +1801,22 @@
'ix' => array(),
'uc' => array()
),
+ 'fm_tenant_claim_history' => array(
+ 'fd' => array(
+ 'history_id' => array('type' =>
'auto','precision' => '4','nullable' => False),
+ 'history_record_id' => array('type' =>
'int','precision' => '4','nullable' => False),
+ 'history_appname' => array('type' =>
'varchar','precision' => '64','nullable' => False),
+ 'history_owner' => array('type' =>
'int','precision' => '4','nullable' => False),
+ 'history_status' => array('type' =>
'char','precision' => '2','nullable' => False),
+ 'history_new_value' => array('type' =>
'text','nullable' => False),
+ 'history_old_value' => array('type' =>
'text','nullable' => true),
+ 'history_timestamp' => array('type' =>
'timestamp','nullable' => False,'default' => 'current_timestamp')
+ ),
+ 'pk' => array('history_id'),
+ 'fk' => array(),
+ 'ix' => array(),
+ 'uc' => array()
+ ),
'fm_owner' => array(
'fd' => array(
'id' => array('type' => 'int','precision' =>
'4','nullable' => False),
Modified: branches/Version-1_0-branch/property/setup/tables_update.inc.php
===================================================================
--- branches/Version-1_0-branch/property/setup/tables_update.inc.php
2013-09-09 08:42:09 UTC (rev 11282)
+++ branches/Version-1_0-branch/property/setup/tables_update.inc.php
2013-09-09 08:44:38 UTC (rev 11283)
@@ -7546,7 +7546,6 @@
}
-
/**
* Update property version from 0.9.17.668 to 0.9.17.669
* Add check for missing budgets
@@ -7589,3 +7588,42 @@
return $GLOBALS['setup_info']['property']['currentver'];
}
}
+
+
+ /**
+ * Update property version from 0.9.17.669 to 0.9.17.670
+ * Add history for tenant claim
+ */
+ $test[] = '0.9.17.669';
+ function property_upgrade0_9_17_669()
+ {
+ $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+
+ $GLOBALS['phpgw_setup']->oProc->query("DELETE FROM fm_cache");
+
+ $GLOBALS['phpgw_setup']->oProc->CreateTable(
+ 'fm_tenant_claim_history', array(
+ 'fd' => array(
+ 'history_id' => array('type' =>
'auto','precision' => '4','nullable' => False),
+ 'history_record_id' => array('type' =>
'int','precision' => '4','nullable' => False),
+ 'history_appname' => array('type' =>
'varchar','precision' => '64','nullable' => False),
+ 'history_owner' => array('type' =>
'int','precision' => '4','nullable' => False),
+ 'history_status' => array('type' =>
'char','precision' => '2','nullable' => False),
+ 'history_new_value' => array('type' =>
'text','nullable' => False),
+ 'history_old_value' => array('type' =>
'text','nullable' => true),
+ 'history_timestamp' => array('type' =>
'timestamp','nullable' => False,'default' => 'current_timestamp')
+ ),
+ 'pk' => array('history_id'),
+ 'fk' => array(),
+ 'ix' => array(),
+ 'uc' => array()
+ )
+ );
+
+ if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+ {
+ $GLOBALS['setup_info']['property']['currentver'] =
'0.9.17.670';
+ return $GLOBALS['setup_info']['property']['currentver'];
+ }
+ }
+
Modified: branches/Version-1_0-branch/property/templates/base/tenant_claim.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/tenant_claim.xsl
2013-09-09 08:42:09 UTC (rev 11282)
+++ branches/Version-1_0-branch/property/templates/base/tenant_claim.xsl
2013-09-09 08:44:38 UTC (rev 11283)
@@ -354,6 +354,12 @@
</input>
</td>
</tr>
+ <tr>
+ <td colspan="2">
+ <div
id="datatable-container_1"/>
+ </td>
+ </tr>
+
</table>
</form>
<script type="text/javascript">
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [11283] Merge 11279:11282 from trunk,
Sigurd Nes <=