|
| From: | Torstein |
| Subject: | [Fmsystem-commits] [9130] |
| Date: | Thu, 12 Apr 2012 11:40:14 +0000 |
Revision: 9130
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9130
Author: vator
Date: 2012-04-12 11:40:13 +0000 (Thu, 12 Apr 2012)
Log Message:
-----------
Modified Paths:
--------------
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.uicheck_list.inc.php
===================================================================
--- trunk/controller/inc/class.uicheck_list.inc.php 2012-04-12 11:07:30 UTC
(rev 9129)
+++ trunk/controller/inc/class.uicheck_list.inc.php 2012-04-12 11:40:13 UTC
(rev 9130)
@@ -568,23 +568,8 @@
$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();
+ /* ================ Ikke slett!!! Kode som henter ut
utstyr basert på lokasjon ==================
- // Fetches all control items for a check list
- $control_items =
$this->so_control_item_list->get_control_items_by_control($check_list->get_control_id());
-
- // Fetches all check items for a check list as objects
- $check_items =
$this->so_check_item->get_check_items($check_list_id, null, null,
"return_object");
-
-
- // Puts closed check items of type measurement into
array
- foreach($check_items as $check_item){
- if($check_item->get_control_item()->get_type()
== "control_item_type_2" & $check_item->get_status() == 1){
- $remove_control_item_ids_array[] =
$check_item->get_control_item_id();
- }
- }
-
//get control items based on control group/component
connection
$control_groups_for_control =
$this->so_control_group->get_control_group_ids_for_control($control->get_id());
//_debug_array($control_groups_for_control);
@@ -620,27 +605,16 @@
}
}
}
-
+
=====================================================================*/
//_debug_array($control_group_check_items);
-
-
- // Makes control items list stripped for closed check
items of type measurement
- foreach($control_items as $control_item){
- if( !in_array($control_item->get_id(),
$remove_control_item_ids_array) ){
- $control_items_for_check_list[] =
$control_item->toArray();
- }
- }
-
+
$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(),
'check_list'
=> $check_list->toArray(),
'location_array'
=> $location_array,
- 'control_items_for_check_list' =>
$control_items_for_check_list,
'control_groups_with_items_array' =>
$control_groups_with_items_array
);
Modified: trunk/controller/templates/base/check_list/register_case.xsl
===================================================================
--- trunk/controller/templates/base/check_list/register_case.xsl
2012-04-12 11:07:30 UTC (rev 9129)
+++ trunk/controller/templates/base/check_list/register_case.xsl
2012-04-12 11:40:13 UTC (rev 9130)
@@ -27,62 +27,62 @@
<xsl:for-each
select="control_items">
<li
class="list_item">
-
<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">
-
<xsl:variable name="control_item_id"><xsl:value-of select="id"/></xsl:variable>
-
<input type="hidden" name="control_item_id" value="{$control_item_id}" />
-
<input name="check_list_id" type="hidden"><xsl:attribute
name="value"><xsl:value-of select="//check_list/id"/></xsl:attribute></input>
-
<input name="status" type="hidden" value="0" />
-
<input name="type" type="hidden" value="control_item_type_1" />
-
- <div>
-
<label class="comment">Beskrivelse av sak</label>
-
<textarea name="case_descr">
-
<xsl:value-of select="comment"/>
-
</textarea>
-
</div>
-
<input type="submit" class="btn not_active" name="save_control"
value="Registrer sak" />
- </form>
- </xsl:when>
- <xsl:when
test="type = 'control_item_type_2'">
- <form
class="frm_register_case expand_item"
action="index.php?menuaction=controller.uicase.register_case&phpgw_return_as=json"
method="post">
-
<xsl:variable name="control_item_id"><xsl:value-of select="id"/></xsl:variable>
-
<input type="hidden" name="control_item_id" value="{$control_item_id}" />
-
<input name="check_list_id" type="hidden"><xsl:attribute
name="value"><xsl:value-of select="//check_list/id"/></xsl:attribute></input>
-
<input name="type" type="hidden" value="control_item_type_2" />
+
<h4><img src="controller/images/arrow_right.png" /><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">
+
<xsl:variable name="control_item_id"><xsl:value-of
select="id"/></xsl:variable>
+
<input type="hidden" name="control_item_id"
value="{$control_item_id}" />
+
<input name="check_list_id"
type="hidden"><xsl:attribute name="value"><xsl:value-of
select="//check_list/id"/></xsl:attribute></input>
+
<input name="status" type="hidden" value="0" />
+
<input name="type" type="hidden"
value="control_item_type_1" />
+
+
<div>
+
<label class="comment">Beskrivelse av sak</label>
+
<textarea name="case_descr">
+
<xsl:value-of select="comment"/>
+
</textarea>
+
</div>
+
<input type="submit" class="btn not_active"
name="save_control" value="Registrer sak" />
+
</form>
+
</xsl:when>
+
<xsl:when test="type = 'control_item_type_2'">
+
<form class="frm_register_case expand_item"
action="index.php?menuaction=controller.uicase.register_case&phpgw_return_as=json"
method="post">
+
<xsl:variable name="control_item_id"><xsl:value-of
select="id"/></xsl:variable>
+
<input type="hidden" name="control_item_id"
value="{$control_item_id}" />
+
<input name="check_list_id"
type="hidden"><xsl:attribute name="value"><xsl:value-of
select="//check_list/id"/></xsl:attribute></input>
+
<input name="type" type="hidden"
value="control_item_type_2" />
+
+
<div>
+
<label>Status</label>
+
<select name="status">
+
<option value="0"
SELECTED="SELECTED">Ikke utført</option>
+
<option value="1" >Utført</option>
+
<option value="2" >Venter på
tilbakemelding</option>
+
</select>
+
</div>
+
<div>
+
<label class="comment">Registrer målingsverdi</label>
+
<input>
+
<xsl:attribute
name="name">measurement</xsl:attribute>
+
<xsl:attribute name="type">text</xsl:attribute>
+
<xsl:attribute name="value">
+
<xsl:value-of select="measurement"/>
+
</xsl:attribute>
+
</input>
+
</div>
+
<div>
+
<label class="comment">Beskrivelse av sak</label>
+
<textarea name="case_descr">
+
<xsl:value-of select="comment"/>
+
</textarea>
+
</div>
+
<xsl:variable name="lang_save"><xsl:value-of
select="php:function('lang', 'register_error')" /></xsl:variable>
+
<input type="submit" name="save_control" value="Registrer
måling" class="not_active" title="{$lang_save}" />
+
</form>
+
</xsl:when>
+
</xsl:choose>
-
<div>
-
<label>Status</label>
-
<select name="status">
-
<option value="0" SELECTED="SELECTED">Ikke utført</option>
-
<option value="1" >Utført</option>
-
<option value="2" >Venter på tilbakemelding</option>
-
</select>
-
</div>
- <div>
- <label
class="comment">Registrer målingsverdi</label>
-
<input>
-
<xsl:attribute name="name">measurement</xsl:attribute>
-
<xsl:attribute name="type">text</xsl:attribute>
-
<xsl:attribute name="value">
-
<xsl:value-of select="measurement"/>
-
</xsl:attribute>
-
</input>
- </div>
- <div>
-
<label class="comment">Beskrivelse av sak</label>
-
<textarea name="case_descr">
-
<xsl:value-of select="comment"/>
-
</textarea>
-
</div>
-
<xsl:variable name="lang_save"><xsl:value-of select="php:function('lang',
'register_error')" /></xsl:variable>
-
<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>
Modified: trunk/controller/templates/base/css/base.css
===================================================================
--- trunk/controller/templates/base/css/base.css 2012-04-12 11:07:30 UTC
(rev 9129)
+++ trunk/controller/templates/base/css/base.css 2012-04-12 11:40:13 UTC
(rev 9130)
@@ -553,10 +553,13 @@
ul.expand_list h4 {
cursor: pointer;
- font-size: 17px;
+ font-size: 1.1em;
margin-bottom: 6px;
margin-top: 0;
}
+ul.expand_list h4 img {
+ height: 12px;
+}
ul.expand_list li ul {
display:none;
| [Prev in Thread] | Current Thread | [Next in Thread] |