[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [8831]
|
From: |
Torstein |
|
Subject: |
[Fmsystem-commits] [8831] |
|
Date: |
Mon, 13 Feb 2012 07:25:19 +0000 |
Revision: 8831
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8831
Author: vator
Date: 2012-02-13 07:25:18 +0000 (Mon, 13 Feb 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/controller/inc/class.socheck_item.inc.php
trunk/controller/inc/class.socheck_list.inc.php
trunk/controller/inc/class.uicheck_list.inc.php
trunk/controller/inc/helper/class.status_checker.inc.php
trunk/controller/inc/model/class.check_list.inc.php
trunk/controller/js/controller/ajax.js
trunk/controller/setup/setup.inc.php
trunk/controller/setup/tables_current.inc.php
trunk/controller/setup/tables_update.inc.php
trunk/controller/templates/base/check_list/edit_check_list.xsl
trunk/controller/templates/base/check_list/view_open_cases.xsl
trunk/controller/templates/base/css/base.css
Modified: trunk/controller/inc/class.socheck_item.inc.php
===================================================================
--- trunk/controller/inc/class.socheck_item.inc.php 2012-02-13 06:57:11 UTC
(rev 8830)
+++ trunk/controller/inc/class.socheck_item.inc.php 2012-02-13 07:25:18 UTC
(rev 8831)
@@ -305,7 +305,7 @@
else if($status == 'waiting')
$sql .= "AND cic.status = 2 ";
else if($status == 'open_or_waiting')
- $sql .= "AND cic.status = 0 OR cic.status = 2";
+ $sql .= "AND (cic.status = 0 OR cic.status = 2)
";
if($type == 'control_item_type_1')
$sql .= "AND coi.type = 'control_item_type_1' ";
Modified: trunk/controller/inc/class.socheck_list.inc.php
===================================================================
--- trunk/controller/inc/class.socheck_list.inc.php 2012-02-13 06:57:11 UTC
(rev 8830)
+++ trunk/controller/inc/class.socheck_list.inc.php 2012-02-13 07:25:18 UTC
(rev 8831)
@@ -53,7 +53,7 @@
public function get_single($check_list_id){
$sql = "SELECT cl.id as cl_id, cl.status as cl_status,
cl.control_id, cl.comment as cl_comment, deadline, planned_date, ";
- $sql .= "completed_date, location_code, component_id,
num_open_cases, ci.id as ci_id, ci.status as ci_status, control_item_id, ";
+ $sql .= "completed_date, location_code, component_id,
num_open_cases, num_pending_cases, ci.id as ci_id, ci.status as ci_status,
control_item_id, ";
$sql .= "ci.comment as ci_comment, check_list_id ";
$sql .= "FROM controller_check_list cl ";
$sql .= "LEFT JOIN controller_check_item as ci ON cl.id =
ci.check_list_id ";
@@ -76,6 +76,7 @@
$check_list->set_location_code($this->unmarshal($this->db->f('location_code',
true), 'string'));
$check_list->set_component_id($this->unmarshal($this->db->f('component_id',
true), 'int'));
$check_list->set_num_open_cases($this->unmarshal($this->db->f('num_open_cases',
true), 'int'));
+
$check_list->set_num_pending_cases($this->unmarshal($this->db->f('num_pending_cases',
true), 'int'));
}
$check_item = new
controller_check_item($this->unmarshal($this->db->f('ci_id', true), 'int'));
@@ -98,7 +99,7 @@
}
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 = "SELECT cl.id as cl_id, cl.status as cl_status,
cl.control_id, cl.comment as cl_comment, deadline, planned_date,
completed_date, num_open_cases, location_code, num_pending_cases, ";
$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_title, coi.required as coi_required,
";
$sql .= "coi.what_to_do as coi_what_to_do, coi.how_to_do as
coi_how_to_do, coi.control_group_id as coi_control_group_id, coi.type ";
@@ -130,7 +131,9 @@
$check_list->set_deadline($this->unmarshal($this->db->f('deadline', true),
'int'));
$check_list->set_planned_date($this->unmarshal($this->db->f('planned_date',
true), 'int'));
$check_list->set_completed_date($this->unmarshal($this->db->f('completed_date',
true), 'int'));
-
$check_list->set_location_code($this->unmarshal($this->db->f('location_code',
true), 'string'));
+
$check_list->set_location_code($this->unmarshal($this->db->f('location_code',
true), 'string'));
+
$check_list->set_num_open_cases($this->unmarshal($this->db->f('num_open_cases',
true), 'int'));
+
$check_list->set_num_pending_cases($this->unmarshal($this->db->f('num_pending_cases',
true), 'int'));
}
if($this->db->f('ci_id', true) != ''){
@@ -207,7 +210,7 @@
function get_check_lists_for_control($control_id){
$sql = "SELECT cl.id as cl_id, cl.status as cl_status,
cl.comment as cl_comment, deadline, planned_date, ";
- $sql .= "completed_date, component_id, location_code,
num_open_cases, ";
+ $sql .= "completed_date, component_id, location_code,
num_open_cases, num_pending_cases ";
$sql .= "ci.id as ci_id, ci.status as ci_status,
control_item_id, ci.comment as ci_comment, check_list_id ";
$sql .= "FROM controller_check_list cl, controller_check_item
ci ";
$sql .= "WHERE cl.control_id = $control_id ";
@@ -236,6 +239,7 @@
$check_list->set_component_id($this->unmarshal($this->db->f('component_id',
true), 'int'));
$check_list->set_location_code($this->unmarshal($this->db->f('location_code',
true), 'string'));
$check_list->set_num_open_cases($this->unmarshal($this->db->f('num_open_cases',
true), 'int'));
+
$check_list->set_num_pending_cases($this->unmarshal($this->db->f('num_pending_cases',
true), 'int'));
$check_items_array = array();
}
@@ -263,7 +267,7 @@
function get_planned_check_lists_for_control($control_id,
$location_code){
$sql = "SELECT cl.id as cl_id, cl.status as cl_status,
cl.comment as cl_comment, deadline, planned_date, ";
- $sql .= "completed_date, component_id, location_code,
num_open_cases ";
+ $sql .= "completed_date, component_id, location_code,
num_open_cases, num_pending_cases ";
$sql .= "FROM controller_check_list cl ";
$sql .= "WHERE cl.control_id = $control_id ";
$sql .= "AND cl.location_code = '{$location_code}' ";
@@ -289,6 +293,8 @@
$check_list->set_completed_date($this->unmarshal($this->db->f('completed_date',
true), 'int'));
$check_list->set_component_id($this->unmarshal($this->db->f('component_id',
true), 'int'));
$check_list->set_location_code($this->unmarshal($this->db->f('location_code',
true), 'string'));
+
$check_list->set_num_open_cases($this->unmarshal($this->db->f('num_open_cases',
true), 'int'));
+
$check_list->set_num_pending_cases($this->unmarshal($this->db->f('num_pending_cases',
true), 'int'));
}
$check_list_id = $check_list->get_id();
}
@@ -389,7 +395,7 @@
$use_location_inparam = false;
$sql = "SELECT c.id as c_id, title, description, start_date,
end_date, control_area_id, c.location_code as c_location_code, repeat_type,
repeat_interval, ";
$sql .= "cl.id as cl_id, cl.status as cl_status, cl.comment as
cl_comment, deadline, planned_date, completed_date, ";
- $sql .= "cl.component_id as cl_component_id, cl.location_code
as cl_location_code, num_open_cases ";
+ $sql .= "cl.component_id as cl_component_id, cl.location_code
as cl_location_code, num_open_cases, num_pending_cases ";
$sql .= "FROM controller_control c ";
$sql .= "LEFT JOIN controller_check_list cl on cl.control_id =
c.id ";
$sql .= "WHERE cl.location_code = '{$location_code}' ";
@@ -447,7 +453,8 @@
$check_list->set_completed_date($this->unmarshal($this->db->f('completed_date',
true), 'int'));
$check_list->set_component_id($this->unmarshal($this->db->f('cl_component_id',
true), 'int'));
$check_list->set_location_code($this->unmarshal($this->db->f('cl_location_code',
true), 'string'));
-
$check_list->set_num_open_cases($this->unmarshal($this->db->f('num_open_cases',
true), 'int'));
+
$check_list->set_num_open_cases($this->unmarshal($this->db->f('num_open_cases',
true), 'int'));
+
$check_list->set_num_pending_cases($this->unmarshal($this->db->f('num_pending_cases',
true), 'int'));
$check_lists_array[] = $check_list;
@@ -465,7 +472,7 @@
function get_check_lists_for_location_2( $location_code, $from_date_ts,
$to_date_ts, $repeat_type ){
$sql = "SELECT c.id as c_id, ";
$sql .= "cl.id as cl_id, cl.status as cl_status, cl.comment as
cl_comment, deadline, planned_date, completed_date, ";
- $sql .= "cl.component_id as cl_component_id, cl.location_code
as cl_location_code, num_open_cases ";
+ $sql .= "cl.component_id as cl_component_id, cl.location_code
as cl_location_code, num_open_cases, num_pending_cases ";
$sql .= "FROM controller_control c ";
$sql .= "LEFT JOIN controller_check_list cl on cl.control_id =
c.id ";
$sql .= "WHERE cl.location_code = '{$location_code}' ";
@@ -506,6 +513,7 @@
$check_list->set_component_id($this->unmarshal($this->db->f('cl_component_id',
true), 'int'));
$check_list->set_location_code($this->unmarshal($this->db->f('cl_location_code',
true), 'string'));
$check_list->set_num_open_cases($this->unmarshal($this->db->f('num_open_cases',
true), 'int'));
+
$check_list->set_num_pending_cases($this->unmarshal($this->db->f('num_pending_cases',
true), 'int'));
$check_lists_array[] = $check_list;
@@ -523,7 +531,7 @@
function get_check_list_for_date($control_id, $current_date){
$sql = "SELECT c.id as c_id, title, description, start_date,
end_date, control_area_id, c.location_code as c_location_code, repeat_type,
repeat_interval, ";
$sql .= "cl.id as cl_id, cl.status as cl_status, cl.comment as
cl_comment, deadline, planned_date, completed_date, ";
- $sql .= "cl.component_id as cl_component_id, cl.location_code
as cl_location_code, num_open_cases ";
+ $sql .= "cl.component_id as cl_component_id, cl.location_code
as cl_location_code, num_open_cases, num_pending_cases ";
$sql .= "FROM controller_control c ";
$sql .= "LEFT JOIN controller_check_list cl on cl.control_id =
c.id ";
$sql .= "WHERE c.id = {$control_id} ";
@@ -546,6 +554,7 @@
$check_list->set_component_id($this->unmarshal($this->db->f('cl_component_id',
true), 'int'));
$check_list->set_location_code($this->unmarshal($this->db->f('cl_location_code',
true), 'string'));
$check_list->set_num_open_cases($this->unmarshal($this->db->f('num_open_cases',
true), 'int'));
+
$check_list->set_num_pending_cases($this->unmarshal($this->db->f('num_pending_cases',
true), 'int'));
$check_lists_array[] = $check_list;
}
@@ -659,7 +668,8 @@
'completed_date',
'location_code',
'component_id',
- 'num_open_cases'
+ 'num_open_cases',
+ 'num_pending_cases'
);
$values = array(
@@ -671,7 +681,8 @@
$this->marshal($check_list->get_completed_date(),
'int'),
$this->marshal($check_list->get_location_code(),
'string'),
$this->marshal($check_list->get_component_id(), 'int'),
- $this->marshal($check_list->get_num_open_cases(), 'int')
+ $this->marshal($check_list->get_num_open_cases(),
'int'),
+ $this->marshal($check_list->get_num_pending_cases(),
'int')
);
$result = $this->db->query('INSERT INTO controller_check_list
(' . join(',', $cols) . ') VALUES (' . join(',', $values) . ')',
__LINE__,__FILE__);
@@ -692,7 +703,8 @@
'completed_date = ' .
$this->marshal($check_list->get_completed_date(), 'int'),
'location_code = ' .
$this->marshal($check_list->get_location_code(), 'string'),
'component_id = ' .
$this->marshal($check_list->get_component_id(), 'int'),
- 'num_open_cases = ' .
$this->marshal($check_list->get_num_open_cases(), 'int')
+ 'num_open_cases = ' .
$this->marshal($check_list->get_num_open_cases(), 'int'),
+ 'num_pending_cases = ' .
$this->marshal($check_list->get_num_pending_cases(), 'int')
);
$result = $this->db->query('UPDATE controller_check_list SET '
. join(',', $values) . " WHERE id=$id", __LINE__,__FILE__);
Modified: trunk/controller/inc/class.uicheck_list.inc.php
===================================================================
--- trunk/controller/inc/class.uicheck_list.inc.php 2012-02-13 06:57:11 UTC
(rev 8830)
+++ trunk/controller/inc/class.uicheck_list.inc.php 2012-02-13 07:25:18 UTC
(rev 8831)
@@ -233,7 +233,10 @@
function edit_check_list(){
$check_list_id = phpgw::get_var('check_list_id');
-
+
+ $status_checker = new status_checker();
+ $status_checker->update_check_list_status(
$check_list_id );
+
$check_list = $this->so->get_single($check_list_id);
$control =
$this->so_control->get_single($check_list->get_control_id());
Modified: trunk/controller/inc/helper/class.status_checker.inc.php
===================================================================
--- trunk/controller/inc/helper/class.status_checker.inc.php 2012-02-13
06:57:11 UTC (rev 8830)
+++ trunk/controller/inc/helper/class.status_checker.inc.php 2012-02-13
07:25:18 UTC (rev 8831)
@@ -23,17 +23,23 @@
$check_items =
$this->so_check_item->get_check_items_with_cases($check_list_id,
$control_item_type, $status, $messageStatus, "return_object");
$num_open_cases = 0;
+ $num_pending_cases = 0;
foreach($check_items as $check_item){
foreach($check_item->get_cases_array() as $case){
+
if($case->get_status() == 0 |
$case->get_status() == 2){
$num_open_cases++;
}
+ else if($case->get_status() == 2){
+ $num_pending_cases++;
+ }
}
}
$check_list->set_num_open_cases($num_open_cases);
+ $check_list->set_num_pending_cases($num_pending_cases);
if($num_open_cases > 0)
$check_list->set_status(1);
Modified: trunk/controller/inc/model/class.check_list.inc.php
===================================================================
--- trunk/controller/inc/model/class.check_list.inc.php 2012-02-13 06:57:11 UTC
(rev 8830)
+++ trunk/controller/inc/model/class.check_list.inc.php 2012-02-13 07:25:18 UTC
(rev 8831)
@@ -44,8 +44,9 @@
protected $location_code;
protected $component_id;
- // Aggregate field. Field not in a table
+ // Aggregate fields. Fields not in a table
protected $num_open_cases;
+ protected $num_pending_cases;
// Objects
protected $check_item_array = array();
@@ -138,7 +139,14 @@
{
$this->num_open_cases = $num_open_cases;
}
+
+ public function get_num_pending_cases() { return
$this->num_pending_cases; }
+ public function set_num_pending_cases($num_pending_cases)
+ {
+ $this->num_pending_cases = $num_pending_cases;
+ }
+
public function set_control($control)
{
$this->control = $control;
Modified: trunk/controller/js/controller/ajax.js
===================================================================
--- trunk/controller/js/controller/ajax.js 2012-02-13 06:57:11 UTC (rev
8830)
+++ trunk/controller/js/controller/ajax.js 2012-02-13 07:25:18 UTC (rev
8831)
@@ -479,15 +479,16 @@
var quickEditRowTagStr = "<li
class='quick_edit'><h3>Hurtigendring</h3><fieldset><form
class='frm_update_case' action='" + requestUrl + "'>";
-
+ quickEditRowTagStr += "<label>Måleverdi</label><input
type='text' name='case_measurement'>" + case_measurement + "</input>";
+
if(case_status == 1)
quickEditRowTagStr += "<label>Status</label><select
name='case_status'><option SELECTED='SELECTED' value='1'>Utført</option><option
value='2'>Venter på tilbakemelding</option></select>";
else if(case_status == 2)
quickEditRowTagStr += "<label>Status</label><select
name='case_status'><option value='1'>Utført</option><option SELECTED='SELECTED'
value='2'>Venter på tilbakemelding</option></select>";
quickEditRowTagStr += "<label>Beskrivelse</label><textarea
name='case_descr'>" + case_descr + "</textarea>";
- quickEditRowTagStr += "<label>Måleverdi</label><input
type='text' name='case_measurement'>" + case_measurement + "</input>";
+
quickEditRowTagStr += "<input type='submit' value='Oppdater'
/>";
quickEditRowTagStr += "</fieldset></form></li>";
Modified: trunk/controller/setup/setup.inc.php
===================================================================
--- trunk/controller/setup/setup.inc.php 2012-02-13 06:57:11 UTC (rev
8830)
+++ trunk/controller/setup/setup.inc.php 2012-02-13 07:25:18 UTC (rev
8831)
@@ -1,6 +1,6 @@
<?php
$setup_info['controller']['name'] = 'controller';
- $setup_info['controller']['version'] = '0.1.28';
+ $setup_info['controller']['version'] = '0.1.29';
$setup_info['controller']['app_order'] = 100;
$setup_info['controller']['enable'] = 1;
$setup_info['controller']['app_group'] = 'office';
Modified: trunk/controller/setup/tables_current.inc.php
===================================================================
--- trunk/controller/setup/tables_current.inc.php 2012-02-13 06:57:11 UTC
(rev 8830)
+++ trunk/controller/setup/tables_current.inc.php 2012-02-13 07:25:18 UTC
(rev 8831)
@@ -77,7 +77,8 @@
'completed_date' => array('type' => 'int',
'precision' => 8, 'nullable' => True),
'component_id' => array('type' => 'int',
'precision' => 4, 'nullable' => True),
'location_code' => array('type' => 'varchar',
'precision' => 30, 'nullable' => false),
- 'num_open_cases' => array('type' => 'int',
'precision' => 4, 'nullable' => True)
+ 'num_open_cases' => array('type' => 'int',
'precision' => 4, 'nullable' => True),
+ 'num_pending_cases' => array('type' => 'int',
'precision' => 4, 'nullable' => True)
),
'pk' => array('id'),
'fk' => array(),
Modified: trunk/controller/setup/tables_update.inc.php
===================================================================
--- trunk/controller/setup/tables_update.inc.php 2012-02-13 06:57:11 UTC
(rev 8830)
+++ trunk/controller/setup/tables_update.inc.php 2012-02-13 07:25:18 UTC
(rev 8831)
@@ -593,3 +593,16 @@
return
$GLOBALS['setup_info']['controller']['currentver'];
}
}
+
+ $test[] = '0.1.28';
+ function controller_upgrade0_1_28()
+ {
+
$GLOBALS['phpgw_setup']->oProc->AddColumn('controller_check_list','num_pending_cases',array(
+ 'type' => 'int',
+ 'precision' => 4,
+ 'nullable' => True
+ ));
+
+ $GLOBALS['setup_info']['controller']['currentver'] = '0.1.29';
+ return $GLOBALS['setup_info']['controller']['currentver'];
+ }
\ No newline at end of file
Modified: trunk/controller/templates/base/check_list/edit_check_list.xsl
===================================================================
--- trunk/controller/templates/base/check_list/edit_check_list.xsl
2012-02-13 06:57:11 UTC (rev 8830)
+++ trunk/controller/templates/base/check_list/edit_check_list.xsl
2012-02-13 07:25:18 UTC (rev 8831)
@@ -66,6 +66,10 @@
<label>Antall åpne saker</label>
<xsl:value-of select="check_list/num_open_cases"/>
</div>
+ <div>
+ <label>Antall ventende saker</label>
+ <xsl:value-of
select="check_list/num_pending_cases"/>
+ </div>
<div>
<label>Skal utføres innen</label>
<input>
Modified: trunk/controller/templates/base/check_list/view_open_cases.xsl
===================================================================
--- trunk/controller/templates/base/check_list/view_open_cases.xsl
2012-02-13 06:57:11 UTC (rev 8830)
+++ trunk/controller/templates/base/check_list/view_open_cases.xsl
2012-02-13 07:25:18 UTC (rev 8831)
@@ -96,10 +96,9 @@
</xsl:otherwise>
</xsl:choose>
- <h2>Saker</h2>
+ <h2 class="last">Saker</h2>
<xsl:choose>
<xsl:when
test="open_check_items_and_cases/child::node()">
- <h2>Saker</h2>
<ul class="check_items">
<xsl:for-each
select="open_check_items_and_cases">
<xsl:choose>
@@ -128,9 +127,9 @@
</xsl:otherwise>
</xsl:choose>
<div class="quick_menu">
-
<a>
+
<a class="quick_edit">
<xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicase.edit_case</xsl:text>
+
<xsl:text>index.php?menuaction=controller.uicase.save_case</xsl:text>
<xsl:text>&case_id=</xsl:text>
<xsl:value-of select="id"/>
<xsl:text>&check_list_id=</xsl:text>
@@ -155,6 +154,12 @@
</xsl:when>
</xsl:choose>
</div>
+
<div style="display:none;" class="case_info">
+
<div class="case_id"><xsl:value-of select="id"/></div>
+
<div class="case_descr"><xsl:value-of select="descr"/></div>
+
<div class="case_status"><xsl:value-of select="status"/></div>
+
<div class="case_measurement"><xsl:value-of
select="measurement"/></div>
+
</div>
</li>
</xsl:for-each>
</ul>
Modified: trunk/controller/templates/base/css/base.css
===================================================================
--- trunk/controller/templates/base/css/base.css 2012-02-13 06:57:11 UTC
(rev 8830)
+++ trunk/controller/templates/base/css/base.css 2012-02-13 07:25:18 UTC
(rev 8831)
@@ -766,7 +766,7 @@
fieldset.check_list_details label{
display: inline-block;
font-weight: bold;
- width: 135px;
+ width: 150px;
}
.check_item{
margin: 25px 0;
@@ -1111,6 +1111,9 @@
margin:0 0 10px;
font-size: 17px;
}
+.tab_item h2.last{
+ margin:20px 0 10px;
+}
.tab_item.active {
display:block;
}
@@ -1268,9 +1271,12 @@
/* ======================== VIEW CASES ============================= */
-li.check_item_case h4{
- margin:5px 0;
+li.check_item_case h4 {
+ margin: 5px 0;
}
+li.check_item_case ul{
+ margin-bottom: 20px;
+}
li.check_item_case ul li {
border: 1px solid #AAAAAA;
margin: 5px 0 0;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [8831],
Torstein <=