[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9166]
|
From: |
Torstein |
|
Subject: |
[Fmsystem-commits] [9166] |
|
Date: |
Tue, 17 Apr 2012 10:43:01 +0000 |
Revision: 9166
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9166
Author: vator
Date: 2012-04-17 10:43:00 +0000 (Tue, 17 Apr 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/controller/inc/class.uicase.inc.php
trunk/controller/templates/base/calendar/view_calendar_month.xsl
trunk/controller/templates/base/case/create_case_message.xsl
trunk/controller/templates/base/case/view_case_message.xsl
trunk/controller/templates/base/css/base.css
Modified: trunk/controller/inc/class.uicase.inc.php
===================================================================
--- trunk/controller/inc/class.uicase.inc.php 2012-04-17 10:41:47 UTC (rev
9165)
+++ trunk/controller/inc/class.uicase.inc.php 2012-04-17 10:43:00 UTC (rev
9166)
@@ -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: trunk/controller/templates/base/calendar/view_calendar_month.xsl
===================================================================
--- trunk/controller/templates/base/calendar/view_calendar_month.xsl
2012-04-17 10:41:47 UTC (rev 9165)
+++ trunk/controller/templates/base/calendar/view_calendar_month.xsl
2012-04-17 10:43:00 UTC (rev 9166)
@@ -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: trunk/controller/templates/base/case/create_case_message.xsl
===================================================================
--- trunk/controller/templates/base/case/create_case_message.xsl
2012-04-17 10:41:47 UTC (rev 9165)
+++ trunk/controller/templates/base/case/create_case_message.xsl
2012-04-17 10:43:00 UTC (rev 9166)
@@ -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: trunk/controller/templates/base/case/view_case_message.xsl
===================================================================
--- trunk/controller/templates/base/case/view_case_message.xsl 2012-04-17
10:41:47 UTC (rev 9165)
+++ trunk/controller/templates/base/case/view_case_message.xsl 2012-04-17
10:43:00 UTC (rev 9166)
@@ -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: trunk/controller/templates/base/css/base.css
===================================================================
--- trunk/controller/templates/base/css/base.css 2012-04-17 10:41:47 UTC
(rev 9165)
+++ trunk/controller/templates/base/css/base.css 2012-04-17 10:43:00 UTC
(rev 9166)
@@ -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] [9166],
Torstein <=