[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [8470]
|
From: |
Torstein |
|
Subject: |
[Fmsystem-commits] [8470] |
|
Date: |
Mon, 02 Jan 2012 13:12:58 +0000 |
Revision: 8470
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8470
Author: vator
Date: 2012-01-02 13:12:58 +0000 (Mon, 02 Jan 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/controller/inc/class.socheck_list.inc.php
trunk/controller/inc/class.uicheck_list_for_location.inc.php
trunk/controller/inc/model/class.check_item.inc.php
trunk/controller/inc/model/class.control_item.inc.php
trunk/controller/templates/base/create_error_report_message.xsl
trunk/controller/templates/base/css/base.css
trunk/controller/templates/base/edit_check_list.xsl
Modified: trunk/controller/inc/class.socheck_list.inc.php
===================================================================
--- trunk/controller/inc/class.socheck_list.inc.php 2012-01-02 09:42:41 UTC
(rev 8469)
+++ trunk/controller/inc/class.socheck_list.inc.php 2012-01-02 13:12:58 UTC
(rev 8470)
@@ -88,7 +88,7 @@
}
}
- public function get_single_with_check_items($check_list_id, $status){
+ public function get_single_with_check_items($check_list_id, $status,
$type){
$sql = "SELECT cl.id as cl_id, cl.status as cl_status,
cl.control_id, cl.comment as cl_comment, deadline, planned_date,
completed_date, location_code, ";
$sql .= "ci.id as ci_id, ci.status as ci_status,
control_item_id, ci.comment as ci_comment, check_list_id, ";
$sql .= "coi.title as coi_id, coi.title as coi_title,
coi.required as coi_required, coi.required as coi_required, ";
@@ -96,11 +96,18 @@
$sql .= "FROM controller_check_list cl ";
$sql .= "LEFT JOIN controller_check_item as ci ON cl.id =
ci.check_list_id ";
$sql .= "LEFT JOIN controller_control_item as coi ON
ci.control_item_id = coi.id ";
- $sql .= "WHERE cl.id = $check_list_id";
+ $sql .= "WHERE cl.id = $check_list_id ";
if($status == 'open')
- $sql .= "AND ci.status = 0";
+ $sql .= "AND ci.status = 0 ";
+ else if($status == 'handled')
+ $sql .= "AND ci.status = 1 ";
+
+ if($type != null)
+ $sql .= "AND coi.type = '$type'";
+
+
$this->db->query($sql);
$counter = 0;
Modified: trunk/controller/inc/class.uicheck_list_for_location.inc.php
===================================================================
--- trunk/controller/inc/class.uicheck_list_for_location.inc.php
2012-01-02 09:42:41 UTC (rev 8469)
+++ trunk/controller/inc/class.uicheck_list_for_location.inc.php
2012-01-02 13:12:58 UTC (rev 8470)
@@ -361,37 +361,47 @@
function edit_check_list_for_location(){
$check_list_id = phpgw::get_var('check_list_id');
+
+ // Fetches check list with check items
+ $open_check_list_with_check_items =
$this->so_check_list->get_single_with_check_items($check_list_id, 'open');
+
+ // Fetches check list with check items
+ $handled_check_list_with_check_items =
$this->so_check_list->get_single_with_check_items($check_list_id, 'handled');
- $check_list_with_check_items =
$this->so_check_list->get_single_with_check_items($check_list_id);
-
- $location_code =
$check_list_with_check_items["location_code"];
+ $location_code =
$open_check_list_with_check_items["location_code"];
- $control_item_list_all =
$this->so_control_item->get_control_items_by_control_id($check_list_with_check_items["control_id"]);
+ // Fetches all control items for check list
+ $control_items_for_check_list =
$this->so_control_item->get_control_items_by_control_id($open_check_list_with_check_items["control_id"]);
+ // Puts ids for control items that is registered as
check item in an array
$control_item_ids = array();
-
foreach($check_list_with_check_items["check_item_array"] as $check_item){
+
foreach($open_check_list_with_check_items["check_item_array"] as $check_item){
$control_item_ids[] =
$check_item["control_item_id"];
}
- $control_item_list_stripped = array();
-
- foreach($control_item_list_all as $control_item){
-
+ // Puts control items not registered as check item in
an array
+ $control_items_not_registered = array();
+ foreach($control_items_for_check_list as $control_item){
if( !in_array($control_item->get_id(),
$control_item_ids) ){
- $control_item_list_stripped[] =
$control_item->toArray();
+ $control_items_not_registered[] =
$control_item->toArray();
}
- }
+ }
+ // Fetches check items that registeres measurement
+ $measurement_check_items =
$this->so_check_list->get_single_with_check_items($check_list_id, null,
'control_item_type_2');
+
$date_format =
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
$location_array =
execMethod('property.bolocation.read_single', array('location_code' =>
$location_code));
$data = array
(
- 'location_array' => $location_array,
- 'check_list' =>
$check_list_with_check_items,
- 'control_items_list' =>
$control_item_list_stripped,
- 'date_format' => $date_format
+ 'open_check_list_with_check_items'
=> $open_check_list_with_check_items,
+ 'handled_check_list_with_check_items' =>
$handled_check_list_with_check_items,
+ 'control_items_not_registered'
=> $control_items_not_registered,
+ 'measurement_check_items'
=> $measurement_check_items,
+ 'location_array'
=> $location_array,
+ 'date_format'
=> $date_format
);
self::add_javascript('controller', 'controller',
'jquery.js');
Modified: trunk/controller/inc/model/class.check_item.inc.php
===================================================================
--- trunk/controller/inc/model/class.check_item.inc.php 2012-01-02 09:42:41 UTC
(rev 8469)
+++ trunk/controller/inc/model/class.check_item.inc.php 2012-01-02 13:12:58 UTC
(rev 8470)
@@ -40,7 +40,8 @@
protected $comment;
protected $check_list_id;
protected $message_ticket_id;
-
+ protected $measurement;
+
// Objects
protected $control_item;
@@ -97,7 +98,14 @@
public function get_message_ticket_id() { return
$this->message_ticket_id; }
+ public function set_measurement($measurement)
+ {
+ $this->measurement = $measurement;
+ }
+ public function get_measurement() { return $this->measurement; }
+
+
// ================= Getters and setters for objects
=================
public function set_control_item($control_item)
Modified: trunk/controller/inc/model/class.control_item.inc.php
===================================================================
--- trunk/controller/inc/model/class.control_item.inc.php 2012-01-02
09:42:41 UTC (rev 8469)
+++ trunk/controller/inc/model/class.control_item.inc.php 2012-01-02
13:12:58 UTC (rev 8470)
@@ -40,6 +40,7 @@
protected $what_to_do;
protected $how_to_do;
protected $control_group_id;
+ protected $type;
/**
* Constructor. Takes an optional ID. If a contract is
created from outside
@@ -100,6 +101,13 @@
}
public function get_control_group_name() { return
$this->control_group_name; }
+
+ public function set_type($type)
+ {
+ $this->type = $type;
+ }
+
+ public function get_type() { return $this->type; }
/**
* Get a static reference to the storage object associated with
this model object
Modified: trunk/controller/templates/base/create_error_report_message.xsl
===================================================================
--- trunk/controller/templates/base/create_error_report_message.xsl
2012-01-02 09:42:41 UTC (rev 8469)
+++ trunk/controller/templates/base/create_error_report_message.xsl
2012-01-02 13:12:58 UTC (rev 8470)
@@ -71,12 +71,12 @@
<div class="form-buttons">
<xsl:variable
name="lang_save"><xsl:value-of select="php:function('lang', 'save')"
/></xsl:variable>
- <input type="submit"
name="save_control" value="{$lang_save}" title="{$lang_save}" />
+ <input class="btn"
type="submit" name="save_control" value="{$lang_save}" title="{$lang_save}" />
</div>
</form>
</xsl:when>
<xsl:otherwise>
- Ingen sjekkpunkter
+ Ingen registrerte avvik
</xsl:otherwise>
</xsl:choose>
</fieldset>
Modified: trunk/controller/templates/base/css/base.css
===================================================================
--- trunk/controller/templates/base/css/base.css 2012-01-02 09:42:41 UTC
(rev 8469)
+++ trunk/controller/templates/base/css/base.css 2012-01-02 13:12:58 UTC
(rev 8470)
@@ -1021,35 +1021,31 @@
margin:10px;
font-size: 12px;
}
-.tab_menu div.active{
- background: #2647A0;
- border: none;
-}
-.tab_menu div.active a{
- color: #FFF;
-}
.tab_menu {
height: 29px;
overflow: hidden;
}
-.tab_menu div {
- background: none repeat scroll 0 0 #FAFAFA;
- border: 1px solid #A3A3A3;
- float: left;
- font-size: 12px;
- font-weight: normal;
- margin-right: 3px;
-}
-.tab_menu div a {
+.tab_menu a {
+ background: none repeat scroll 0 0 #FAFAFA;
color: #000000;
cursor: pointer;
display: block;
height: 30px;
+ width: 130px;
padding-top: 9px;
text-align: center;
text-decoration: none;
- width: 130px;
+ border: 1px solid #A3A3A3;
+ float: left;
+ font-size: 12px;
+ font-weight: normal;
+ margin-right: 3px;
}
+.tab_menu a.active {
+ background: #2647A0;
+ border: none;
+ color: #FFF;
+}
.tab_item {
background: none repeat scroll 0 0 #EDF5FF;
border: 1px solid #A3A3A3;
@@ -1136,7 +1132,8 @@
#error_message_menu a {
text-align: center;
width: 130px;
- margin: 2px 0;
+ margin: 2px 0;
+ display:block;
}
#view_errors {
Modified: trunk/controller/templates/base/edit_check_list.xsl
===================================================================
--- trunk/controller/templates/base/edit_check_list.xsl 2012-01-02 09:42:41 UTC
(rev 8469)
+++ trunk/controller/templates/base/edit_check_list.xsl 2012-01-02 13:12:58 UTC
(rev 8470)
@@ -23,23 +23,22 @@
});
$(".tab_menu a").click(function(){
+ var thisTabA = $(this);
+ var thisTabMenu = $(this).parent(".tab_menu");
+
+ var showId = $(thisTabA).attr("href");
+ var hideId = $(".tab_menu
a.active").attr("href");
+
+ $(".tab_menu a").removeClass("active");
+ $(".tab_item").removeClass("active");
+ $(thisTabA).addClass('active');
+
+ $(hideId).hide();
+ $(showId).fadeIn('10', function(){
+ $(showId).addClass('active');
+
+ });
- var thisA = $(this);
- var wrpDiv = $(this).parent();
- var showId = $(thisA).attr("href");
-
- var activeA = $(".tab_menu").find("div.active");
- var hideId = $(activeA).find("a").attr("href");
-
-
-
$(".tab_menu").find("div.active").removeClass("active");
-
- $(wrpDiv).addClass("active");
-
- $(hideId).fadeOut('100', function(){
- $(showId).fadeIn('100');
- });
-
return false;
});
@@ -48,10 +47,9 @@
var showId = $(thisA).attr("href");
var hideId = "#view_errors";
- $(hideId).fadeOut('1000', function(){
- $(showId).fadeIn('1000');
- });
- $(thisA).fadeOut('1000');
+ $(hideId).hide();
+ $(showId).fadeIn('10');
+ $(thisA).fadeOut('10');
return false;
});
@@ -65,26 +63,26 @@
<form id="frm_update_check_list"
action="index.php?menuaction=controller.uicheck_list.update_check_list"
method="post">
- <xsl:variable name="check_list_id"><xsl:value-of
select="check_list/id"/></xsl:variable>
+ <xsl:variable name="check_list_id"><xsl:value-of
select="open_check_list_with_check_items/id"/></xsl:variable>
<input type="hidden" name="check_list_id"
value="{$check_list_id}" />
<div>
<label>ID</label>
<input>
<xsl:attribute
name="name">check_list_id</xsl:attribute>
- <xsl:attribute name="value"><xsl:value-of
select="check_list/id"/></xsl:attribute>
+ <xsl:attribute name="value"><xsl:value-of
select="open_check_list_with_check_items/id"/></xsl:attribute>
</input>
</div>
<div>
<label>Status</label>
- <xsl:variable name="status"><xsl:value-of
select="check_list/status"/></xsl:variable>
+ <xsl:variable name="status"><xsl:value-of
select="open_check_list_with_check_items/status"/></xsl:variable>
<select name="status">
<xsl:choose>
- <xsl:when
test="check_list/status = 0">
+ <xsl:when
test="open_check_list_with_check_items/status = 0">
<option value="0"
SELECTED="SELECTED">Ikke utført</option>
<option value="1"
>Utført</option>
</xsl:when>
- <xsl:when
test="check_list/status = 1">
+ <xsl:when
test="open_check_list_with_check_items/status = 1">
<option value="0">Ikke
utført</option>
<option value="1"
SELECTED="SELECTED">Utført</option>
</xsl:when>
@@ -97,8 +95,8 @@
<xsl:attribute
name="id">deadline_date</xsl:attribute>
<xsl:attribute
name="name">deadline_date</xsl:attribute>
<xsl:attribute name="type">text</xsl:attribute>
- <xsl:if test="check_list/deadline != 0">
- <xsl:attribute name="value"><xsl:value-of
select="php:function('date', $date_format,
number(check_list/deadline))"/></xsl:attribute>
+ <xsl:if
test="open_check_list_with_check_items/deadline != 0">
+ <xsl:attribute name="value"><xsl:value-of
select="php:function('date', $date_format,
number(open_check_list_with_check_items/deadline))"/></xsl:attribute>
</xsl:if>
</input>
</div>
@@ -108,8 +106,8 @@
<xsl:attribute
name="id">planned_date</xsl:attribute>
<xsl:attribute
name="name">planned_date</xsl:attribute>
<xsl:attribute name="type">text</xsl:attribute>
- <xsl:if test="check_list/planned_date != 0">
- <xsl:attribute name="value"><xsl:value-of
select="php:function('date', $date_format,
number(check_list/planned_date))"/></xsl:attribute>
+ <xsl:if
test="open_check_list_with_check_items/planned_date != 0">
+ <xsl:attribute name="value"><xsl:value-of
select="php:function('date', $date_format,
number(open_check_list_with_check_items/planned_date))"/></xsl:attribute>
</xsl:if>
</input>
</div>
@@ -119,8 +117,8 @@
<xsl:attribute
name="id">completed_date</xsl:attribute>
<xsl:attribute
name="name">completed_date</xsl:attribute>
<xsl:attribute name="type">text</xsl:attribute>
- <xsl:if test="check_list/completed_date != 0">
- <xsl:attribute name="value"><xsl:value-of
select="php:function('date', $date_format,
number(check_list/completed_date))"/></xsl:attribute>
+ <xsl:if
test="open_check_list_with_check_items/completed_date != 0">
+ <xsl:attribute name="value"><xsl:value-of
select="php:function('date', $date_format,
number(open_check_list_with_check_items/completed_date))"/></xsl:attribute>
</xsl:if>
</input>
</div>
@@ -128,7 +126,7 @@
<label class="comment">Kommentar</label>
<textarea>
<xsl:attribute
name="name">comment</xsl:attribute>
- <xsl:value-of select="check_list/comment"/>
+ <xsl:value-of
select="open_check_list_with_check_items/comment"/>
</textarea>
</div>
@@ -140,42 +138,36 @@
</fieldset>
<div id="error_message_menu">
- <div>
- <a class="btn">
- <xsl:attribute name="id">
- <xsl:text>reg_errors</xsl:text>
- </xsl:attribute>
- <xsl:attribute name="href">
-
<xsl:text>#register_errors</xsl:text>
- </xsl:attribute>
- Registrer avvik
- </a>
- </div>
- <div>
- <a class="btn">
- <xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uierror_report_message.create_error_report_message</xsl:text>
-
<xsl:text>&check_list_id=</xsl:text>
- <xsl:value-of
select="check_list/id"/>
- </xsl:attribute>
- Send avviksmelding
- </a>
- </div>
+ <a class="btn">
+ <xsl:attribute name="id">
+ <xsl:text>reg_errors</xsl:text>
+ </xsl:attribute>
+ <xsl:attribute name="href">
+ <xsl:text>#register_errors</xsl:text>
+ </xsl:attribute>
+ Registrer avvik
+ </a>
+ <a class="btn">
+ <xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uierror_report_message.create_error_report_message</xsl:text>
+ <xsl:text>&check_list_id=</xsl:text>
+ <xsl:value-of
select="open_check_list_with_check_items/id"/>
+ </xsl:attribute>
+ Send avviksmelding
+ </a>
</div>
<div id="register_errors">
- <div class="tab_menu">
- <div class="active"><a>Registrer avvik</a></div>
- </div>
-
+ <div class="tab_menu"><a class="active">Registrer
avvik</a></div>
+
<div class="tab_item active">
<h2 class="check_item_details">Velg sjekkpunkter som
skal registreres som avvik</h2>
<xsl:choose>
- <xsl:when
test="control_items_list/child::node()">
+ <xsl:when
test="control_items_not_registered/child::node()">
<ul id="control_items_list"
class="check_items expand_list">
- <xsl:for-each
select="control_items_list">
+ <xsl:for-each
select="control_items_not_registered">
<li>
<h4><img
src="controller/images/arrow_right.png" width="14"/><span><xsl:value-of
select="title"/></span></h4>
<form
class="frm_save_control_item"
action="index.php?menuaction=controller.uicheck_list.add_check_item_to_list"
method="post">
@@ -185,7 +177,7 @@
<xsl:attribute name="name">check_list_id</xsl:attribute>
<xsl:attribute name="type">hidden</xsl:attribute>
<xsl:attribute name="value">
-
<xsl:value-of select="//check_list/id"/>
+
<xsl:value-of select="//open_check_list_with_check_items/id"/>
</xsl:attribute>
</input>
<input>
@@ -241,19 +233,19 @@
<div id="view_errors">
<div class="tab_menu">
- <div class="active"><a
href="#check_list_not_fixed_list">Vis åpne avvik</a></div>
- <div><a href="#check_list_fixed_list">Vis håndterte
avvik</a></div>
- <div><a href="#view_measurements">Vis målinger</a></div>
+ <a class="active" href="#view_open_errors">Vis åpne
avvik</a>
+ <a href="#view_handled_errors">Vis håndterte avvik</a>
+ <a href="#view_measurements">Vis målinger</a>
</div>
- <div id="check_list_not_fixed_list" class="tab_item active">
+ <div id="view_open_errors" class="tab_item active">
<xsl:choose>
- <xsl:when
test="check_list/check_item_array/child::node()">
+ <xsl:when
test="open_check_list_with_check_items/check_item_array/child::node()">
<div class="expand_menu"><div
class="expand_all">Vis alle</div><div class="collapse_all focus">Skjul
alle</div></div>
<ul id="check_list_not_fixed_list"
class="check_items expand_list">
- <xsl:for-each
select="check_list/check_item_array">
+ <xsl:for-each
select="open_check_list_with_check_items/check_item_array">
<li>
<xsl:if
test="status = 0">
<h4><img src="controller/images/arrow_right.png"
width="14"/><span><xsl:value-of select="control_item/title"/></span></h4>
@@ -266,12 +258,12 @@
<select name="status">
<xsl:choose>
<xsl:when test="status = 0">
-
<option value="0" SELECTED="SELECTED">Feil på
sjekkpunkt</option>
-
<option value="1">Feil fikset</option>
+
<option value="0" SELECTED="SELECTED">Avvik er
åpent</option>
+
<option value="1">Avvik er håndtert</option>
</xsl:when>
<xsl:when test="status = 1">
-
<option value="0">Feil på sjekkpunkt</option>
-
<option value="1" SELECTED="SELECTED">Feil
fikset</option>
+
<option value="0">Avvik er åpent</option>
+
<option value="1" SELECTED="SELECTED">Avvik er
håndtert</option>
</xsl:when>
</xsl:choose>
</select>
@@ -302,19 +294,19 @@
</ul>
</xsl:when>
<xsl:otherwise>
- Ingen sjekkpunkter
+ Ingen registrerte åpne avvik
</xsl:otherwise>
</xsl:choose>
</div>
- <div id="check_list_fixed_list" class="tab_item">
+ <div id="view_handled_errors" class="tab_item">
<xsl:choose>
- <xsl:when
test="check_list/check_item_array/child::node()">
+ <xsl:when
test="handled_check_list_with_check_items/check_item_array/child::node()">
<div class="expand_menu"><div
class="expand_all">Vis alle</div><div class="collapse_all focus">Skjul
alle</div></div>
<ul id="check_list_fixed_list"
class="check_items expand_list">
- <xsl:for-each
select="check_list/check_item_array">
+ <xsl:for-each
select="handled_check_list_with_check_items/check_item_array">
<xsl:if
test="status = 1">
<li>
<h4><img
src="controller/images/arrow_right.png" width="14"/><span><xsl:value-of
select="control_item/title"/></span></h4>
@@ -363,10 +355,72 @@
</ul>
</xsl:when>
<xsl:otherwise>
- Ingen sjekkpunkter
+ Ingen registrerte håndterte
avvik
</xsl:otherwise>
</xsl:choose>
</div>
+
+ <div id="view_measurements" class="tab_item">
+ <xsl:choose>
+ <xsl:when
test="measurement_check_items/check_item_array/child::node()">
+
+ <div class="expand_menu"><div
class="expand_all">Vis alle</div><div class="collapse_all focus">Skjul
alle</div></div>
+
+ <ul id="check_list_not_fixed_list"
class="check_items expand_list">
+ <xsl:for-each
select="handled_check_list_with_check_items/check_item_array">
+ <li>
+ <xsl:if
test="status = 0">
+
<h4><img src="controller/images/arrow_right.png"
width="14"/><span><xsl:value-of select="control_item/title"/></span></h4>
+ <form
class="frm_save_check_item"
action="index.php?menuaction=controller.uicheck_list.save_check_item"
method="post">
+
<xsl:variable name="check_item_id"><xsl:value-of select="id"/></xsl:variable>
+
<input type="hidden" name="check_item_id" value="{$check_item_id}" />
+
<div class="check_item">
+
<div>
+
<label>Status</label>
+
<select name="status">
+
<xsl:choose>
+
<xsl:when test="status = 0">
+
<option value="0" SELECTED="SELECTED">Feil på
sjekkpunkt</option>
+
<option value="1">Feil fikset</option>
+
</xsl:when>
+
<xsl:when test="status = 1">
+
<option value="0">Feil på sjekkpunkt</option>
+
<option value="1" SELECTED="SELECTED">Feil
fikset</option>
+
</xsl:when>
+
</xsl:choose>
+
</select>
+
</div>
+
<div>
+
<label class="comment">Kommentar</label>
+
<textarea name="comment">
+
<xsl:value-of select="comment"/>
+
</textarea>
+
</div>
+
<div>
+
<label>Hva skal gjøres</label>
+
<textarea><xsl:value-of select="control_item/what_to_do"/></textarea>
+
</div>
+
<div>
+
<label>Utførelsesbeskrivelse</label>
+
<textarea><xsl:value-of select="control_item/what_to_do"/></textarea>
+
</div>
+
<div class="form-buttons">
+
<xsl:variable name="lang_save"><xsl:value-of
select="php:function('lang', 'save_check_item')" /></xsl:variable>
+
<input type="submit" name="save_control" value="{$lang_save}"
class="not_active" title="{$lang_save}" />
+
</div>
+
</div>
+ </form>
+ </xsl:if>
+ </li>
+ </xsl:for-each>
+ </ul>
+ </xsl:when>
+ <xsl:otherwise>
+ Ingen registrerte målinger
+ </xsl:otherwise>
+ </xsl:choose>
</div>
+
+ </div>
</div>
</xsl:template>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [8470],
Torstein <=