[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9168] Merge 9165:9166 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [9168] Merge 9165:9166 from trunk |
|
Date: |
Tue, 17 Apr 2012 10:44:28 +0000 |
Revision: 9168
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9168
Author: sigurdne
Date: 2012-04-17 10:44:27 +0000 (Tue, 17 Apr 2012)
Log Message:
-----------
Merge 9165:9166 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/controller/inc/class.uicase.inc.php
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_month.xsl
branches/Version-1_0-branch/controller/templates/base/case/create_case_message.xsl
branches/Version-1_0-branch/controller/templates/base/case/view_case_message.xsl
branches/Version-1_0-branch/controller/templates/base/css/base.css
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-9165
+
/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
Modified: branches/Version-1_0-branch/controller/inc/class.uicase.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.uicase.inc.php
2012-04-17 10:43:12 UTC (rev 9167)
+++ branches/Version-1_0-branch/controller/inc/class.uicase.inc.php
2012-04-17 10:44:27 UTC (rev 9168)
@@ -349,47 +349,19 @@
foreach($cases_array as $case){
$case->set_status( $updateStatus );
- $this->so->update( $case );
+ $this->so->update( $case );
}
- $check_items =
$this->so_check_item->get_check_items_by_message($location_id,
$location_item_id, "return_object");
+ $case = $cases_array[0];
- if($updateStatus == 0){
+ $check_item_id = $case->get_check_item_id();
- foreach($check_items as $check_item){
- $check_item->set_status(0);
-
$this->so_check_item->update($check_item);
- }
- }
- else if($updateStatus == 1){
-
- foreach($check_items as $check_item){
- $check_item =
$this->so_check_item->get_single_with_cases($check_item->get_id());
-
- if($check_item->get_status() == 0){
-
- $cases_array =
$check_item->get_cases_array();
-
- if(count($cases_array) == 0){
-
$check_item->set_status(1);
-
$this->so_check_item->update($check_item);
- }
- else{
- $all_cases_status = 1;
-
- foreach($cases_array as
$case){
-
if($case->get_status() == 0)
-
$all_cases_status = 0;
- }
-
- if($all_cases_status ==
1){
-
$check_item->set_status(1);
-
$this->so_check_item->update($check_item);
- }
- }
- }
- }
- }
+ $check_item = $this->so_check_item->get_single(
$check_item_id );
+ $check_list_id = $check_item->get_check_list_id();
+
+ // Updates status for check list
+ $status_checker = new status_checker();
+ $status_checker->update_check_list_status(
$check_list_id );
}
public function delete_case()
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-04-17 10:43:12 UTC (rev 9167)
+++
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_month.xsl
2012-04-17 10:44:27 UTC (rev 9168)
@@ -57,11 +57,11 @@
var leftNumVal =
leftStrVal.substring(0, leftStrVal.indexOf('px'));
if(leftNumVal == -417){
- $("#days_view").animate({
+ $("#days_view").stop().animate({
left: '-=93'
}, 800);
}else if(leftNumVal > -417){
- $("#days_view").animate({
+ $("#days_view").stop().animate({
left: '-=417'
}, 800);
}
@@ -73,11 +73,11 @@
if( leftNumVal != 0 ){
if(leftNumVal == -93){
-
$("#days_view").animate({
+
$("#days_view").stop().animate({
left: '+=93'
}, 800);
}else if( leftNumVal >= -510 ){
-
$("#days_view").animate({
+
$("#days_view").stop().animate({
left: '+=417'
}, 800);
}
Modified:
branches/Version-1_0-branch/controller/templates/base/case/create_case_message.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/case/create_case_message.xsl
2012-04-17 10:43:12 UTC (rev 9167)
+++
branches/Version-1_0-branch/controller/templates/base/case/create_case_message.xsl
2012-04-17 10:44:27 UTC (rev 9168)
@@ -11,7 +11,7 @@
<!-- ======================= INFO ABOUT MESSAGE
========================= -->
<h3 class="box_header ext">Registrer melding</h3>
- <div class="box ext">
+ <div id="caseMessage" class="box ext">
<xsl:choose>
<xsl:when
test="check_items_and_cases/child::node()">
Modified:
branches/Version-1_0-branch/controller/templates/base/case/view_case_message.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/case/view_case_message.xsl
2012-04-17 10:43:12 UTC (rev 9167)
+++
branches/Version-1_0-branch/controller/templates/base/case/view_case_message.xsl
2012-04-17 10:44:27 UTC (rev 9168)
@@ -4,57 +4,55 @@
<div id="main_content" class="medium">
- <h1>Melding registrert</h1>
+ <h1>Utførelse av kontroll: <xsl:value-of select="control/title"/></h1>
+ <h2>Sjekkliste for: <xsl:value-of
select="location_array/loc1_name"/></h2>
+
+ <xsl:call-template name="check_list_tab_menu" />
+
+ <!-- ======================= INFO ABOUT MESSAGE
========================= -->
+ <h3 class="box_header ext">Melding registrert</h3>
+ <div id="caseMessage" class="box ext">
- <xsl:call-template name="check_list_tab_menu" />
-
- <h3 class="box_header" href="#">Meldingen gjaldt</h3>
- <div id="case_details">
- <h3>Bygg: <xsl:value-of
select="location_array/loc1_name"/></h3>
- <h3>Tittel på kontroll: <xsl:value-of
select="control_array/title"/></h3>
- <xsl:choose>
- <xsl:when test="check_list/completed_date != 0">
- <h3>Kontroll ble utført dato:
<xsl:value-of select="php:function('date', $date_format,
number(check_list/completed_date))"/></h3>
- </xsl:when>
- <xsl:otherwise>
- <h3>Kontroll ble utført dato: Ikke
registrert utført</h3>
- </xsl:otherwise>
- </xsl:choose>
+ <!-- ================== BYGG ===================== -->
+ <div class="row">
+ <label>Bygg:</label> <xsl:value-of
select="location_array/loc1_name"/>
</div>
+
- <h3 class="box_header" href="#">Detaljer for melding</h3>
- <div id="case_details">
- <div>
- <label>Tittel på melding</label>
- <xsl:value-of select="message_ticket/subject"/>
- </div>
+ <!-- === TITLE === -->
+ <div class="row">
+ <label>Tittel på melding:</label>
+ <xsl:value-of select="message_ticket/subject"/>
+ </div>
+ <!-- === CATEGORY === -->
+ <div class="row">
+ <label>Kategori</label><span><xsl:value-of
select="category"/></span>
+ </div>
+ <!-- === UPLOAD FILE === -->
+ <div class="row">
+ <label>Filvedlegg:</label>
- <div>
- <label>Kategori</label>
- <span><xsl:value-of select="category"/></span>
- </div>
-
-
- <h3 class="check_item_details">Meldingen omfattet
følgende saker</h3>
- <ul class="check_items">
- <xsl:for-each select="check_items_and_cases">
- <xsl:choose>
- <xsl:when
test="cases_array/child::node()">
- <li
class="check_item_case">
-
<h4><span><xsl:value-of select="control_item/title"/></span></h4>
- <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:for-each>
- </ul>
- </li>
- </xsl:when>
- </xsl:choose>
- </xsl:for-each>
- </ul>
</div>
- <a class="btn focus">
+
+ <h3>Saker for meldingen</h3>
+ <ul class="cases">
+ <xsl:for-each select="check_items_and_cases">
+ <xsl:choose>
+ <xsl:when
test="cases_array/child::node()">
+ <li class="check_item">
+ <h4><span><xsl:value-of
select="control_item/title"/></span></h4>
+ <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:for-each>
+ </ul>
+ </li>
+ </xsl:when>
+ </xsl:choose>
+ </xsl:for-each>
+ </ul>
+ <a class="btn">
<xsl:attribute name="href">
<xsl:text>index.php?menuaction=controller.uicase.create_case_message</xsl:text>
<xsl:text>&check_list_id=</xsl:text>
@@ -62,5 +60,6 @@
</xsl:attribute>
Registrer ny melding
</a>
+ </div>
</div>
</xsl:template>
Modified: branches/Version-1_0-branch/controller/templates/base/css/base.css
===================================================================
--- branches/Version-1_0-branch/controller/templates/base/css/base.css
2012-04-17 10:43:12 UTC (rev 9167)
+++ branches/Version-1_0-branch/controller/templates/base/css/base.css
2012-04-17 10:44:27 UTC (rev 9168)
@@ -1440,25 +1440,28 @@
}
/* ================================ CASE MESSAGE =============================
*/
-#frmRegCaseMessage label {
+#caseMessage label {
width: 13%;
}
-#frmRegCaseMessage h3 {
+#caseMessage h3 {
font-size: 1.2em;
margin: 1.5em 0 0.5em;
}
-#frmRegCaseMessage ul.cases {
+#caseMessage ul.cases {
background: none repeat scroll 0 0 #FEFCF9;
border: 1px solid #EBE5DD;
padding: 0.5em 1%;
}
-#frmRegCaseMessage ul.cases h4{
+#caseMessage ul.cases h4{
margin-top:0
}
-#frmRegCaseMessage ul li ul li{
+#caseMessage ul li ul li{
padding: 0 0 1em 1em;
}
+#caseMessage a.btn{
+ margin-top:20px;
+}
/* ============================== QUICK MENU ============================= */
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [9168] Merge 9165:9166 from trunk,
Sigurd Nes <=