[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9129]
|
From: |
Torstein |
|
Subject: |
[Fmsystem-commits] [9129] |
|
Date: |
Thu, 12 Apr 2012 11:07:30 +0000 |
Revision: 9129
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9129
Author: vator
Date: 2012-04-12 11:07:30 +0000 (Thu, 12 Apr 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/controller/inc/class.socontrol_item_list.inc.php
trunk/controller/inc/class.uicheck_list.inc.php
trunk/controller/templates/base/check_list/register_case.xsl
trunk/controller/templates/base/css/base.css
Modified: trunk/controller/inc/class.socontrol_item_list.inc.php
===================================================================
--- trunk/controller/inc/class.socontrol_item_list.inc.php 2012-04-12
10:15:26 UTC (rev 9128)
+++ trunk/controller/inc/class.socontrol_item_list.inc.php 2012-04-12
11:07:30 UTC (rev 9129)
@@ -210,7 +210,7 @@
$control_item->set_what_to_do($this->unmarshal($this->db->f('what_to_do',
true), 'string'));
$control_item->set_how_to_do($this->unmarshal($this->db->f('how_to_do', true),
'string'));
$control_item->set_control_group_id($this->unmarshal($this->db->f('control_group_id',
true), 'int'));
-
//$control_item->set_control_group_name($this->unmarshal($this->db->f('control_group_name',
true), 'string'));
+
$control_item->set_type($this->unmarshal($this->db->f('type', true), 'string'));
$results[] = $control_item->toArray();
}
Modified: trunk/controller/inc/class.uicheck_list.inc.php
===================================================================
--- trunk/controller/inc/class.uicheck_list.inc.php 2012-04-12 10:15:26 UTC
(rev 9128)
+++ trunk/controller/inc/class.uicheck_list.inc.php 2012-04-12 11:07:30 UTC
(rev 9129)
@@ -568,8 +568,6 @@
$control_groups_with_items_array[] =
array("control_group" => $control_group->toArray(), "control_items" =>
$saved_control_items);
}
-
-
$control_items_for_check_list = array();
// $remove_control_item_ids_array = array();
@@ -633,9 +631,10 @@
}
}
-
$location_array = execMethod(
'property.bolocation.read_single', array('location_code' =>
$check_list->get_location_code()) );
+ print_r($control_groups_with_items_array);
+
$data = array
(
'control'
=> $control->toArray(),
Modified: trunk/controller/templates/base/check_list/register_case.xsl
===================================================================
--- trunk/controller/templates/base/check_list/register_case.xsl
2012-04-12 10:15:26 UTC (rev 9128)
+++ trunk/controller/templates/base/check_list/register_case.xsl
2012-04-12 11:07:30 UTC (rev 9129)
@@ -14,48 +14,20 @@
<h3 class="box_header ext">Registrer sak/måling</h3>
<div class="tab_item active ext">
+ <div class="expand_menu"><div class="expand_all">Vis
alle</div><div class="collapse_all focus">Skjul alle</div></div>
+
<ul>
<xsl:for-each select="control_groups_with_items_array">
<xsl:choose>
<xsl:when test="control_items/child::node()">
<li class="list_item">
- <xsl:variable
name="control_group_id"><xsl:value-of select="control_group/id"/></xsl:variable>
- <input type="hidden"
name="control_group_id" value="{$control_group_id}" />
-
- <h3><a href="#"><span
class="group_order_nr"><xsl:number/></span>. <xsl:value-of
select="control_group/group_name"/><input type="hidden" name="group_id"
value="{$control_group_id}" /></a></h3>
- <ul class="items">
+
+ <h3><xsl:value-of
select="control_group/group_name"/></h3>
+ <ul class="expand_list">
<xsl:for-each
select="control_items">
- <xsl:variable
name="control_item_id"><xsl:value-of select="id"/></xsl:variable>
-
<li
class="list_item">
- <a
href="#"><span class="item_order_nr"><xsl:number/></span>. <xsl:value-of
select="title"/><input type="hidden" name="item_id" value="{$control_item_id}"
/></a>
- </li>
- </xsl:for-each>
- </ul>
- </li>
- </xsl:when>
- <xsl:otherwise>
- <li class="list_item">
- <h3><span
class="group_order_nr"><xsl:number/></span>. <xsl:value-of
select="control_group/group_name"/></h3>
- <div>Ingen kontrollpunkt for
denne gruppen</div>
- </li>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:for-each>
- </ul>
-
-
-
-
- <xsl:choose>
- <xsl:when
test="control_items_for_check_list/child::node()">
-
- <div class="expand_menu"><div
class="expand_all">Vis alle</div><div class="collapse_all focus">Skjul
alle</div></div>
-
- <ul id="control_items_list" class="check_items
expand_list">
- <xsl:for-each
select="control_items_for_check_list">
- <li>
- <h4><img
src="controller/images/arrow_right.png" width="14"/><span><xsl:value-of
select="title"/></span></h4>
+
+
<h4><img src="controller/images/arrow_right.png"
width="14"/><span><xsl:value-of select="title"/></span></h4>
<xsl:choose>
<xsl:when
test="type = 'control_item_type_1'">
<form
class="frm_register_case expand_item"
action="index.php?menuaction=controller.uicase.register_case&phpgw_return_as=json"
method="post">
@@ -109,15 +81,22 @@
<input type="submit" name="save_control" value="Registrer måling"
class="not_active" title="{$lang_save}" />
</form>
</xsl:when>
- </xsl:choose>
- </li>
- </xsl:for-each>
- </ul>
+ </xsl:choose>
+
+ </li>
+ </xsl:for-each>
+ </ul>
+ </li>
</xsl:when>
<xsl:otherwise>
- Alle sjekkpunkter for kontroll er
registert som åpne/håndterte saker
+ <li class="list_item">
+ <h3><xsl:value-of
select="control_group/group_name"/></h3>
+ <div>Ingen kontrollpunkt for
denne gruppen</div>
+ </li>
</xsl:otherwise>
- </xsl:choose>
+ </xsl:choose>
+ </xsl:for-each>
+ </ul>
</div>
</div>
</div>
Modified: trunk/controller/templates/base/css/base.css
===================================================================
--- trunk/controller/templates/base/css/base.css 2012-04-12 10:15:26 UTC
(rev 9128)
+++ trunk/controller/templates/base/css/base.css 2012-04-12 11:07:30 UTC
(rev 9129)
@@ -709,6 +709,7 @@
.btn, .btn_m, .btn_sm {
background: none repeat scroll 0 0 #4F9AEA;
border: 1px solid #428AD7;
+ border-radius: 4px 4px 4px 4px;
color: #FFFFFF;
cursor: pointer;
display: inline-block;
@@ -1223,15 +1224,15 @@
#check_list_menu div.right_btns {
float: right;
}
-#check_list_menu .right_btns a{
- display: block;
- padding: 4px 0;
- color:#fff;
+#check_list_menu .right_btns a {
background: none repeat scroll 0 0 #F57056;
border-color: #EE836F -moz-use-text-color #CB563F;
+ border-radius: 4px 4px 4px 4px;
border-style: solid none;
border-width: 1px 0;
color: #FFFFFF;
+ display: block;
+ padding: 4px 0;
}
/* ======================== TAB ITEM ========================== */
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [9129],
Torstein <=