[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [8807]
|
From: |
Torstein |
|
Subject: |
[Fmsystem-commits] [8807] |
|
Date: |
Wed, 08 Feb 2012 08:54:04 +0000 |
Revision: 8807
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8807
Author: vator
Date: 2012-02-08 08:54:04 +0000 (Wed, 08 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.uicase.inc.php
trunk/controller/inc/class.uicheck_list.inc.php
trunk/controller/inc/component/class.calendar_builder.inc.php
trunk/controller/inc/component/class.date_generator.inc.php
trunk/controller/js/controller/ajax.js
trunk/controller/templates/base/check_list/register_case.xsl
trunk/controller/templates/base/check_list/view_measurements.xsl
Added Paths:
-----------
trunk/controller/inc/class.uitest.inc.php
Modified: trunk/controller/inc/class.socheck_item.inc.php
===================================================================
--- trunk/controller/inc/class.socheck_item.inc.php 2012-02-08 08:20:37 UTC
(rev 8806)
+++ trunk/controller/inc/class.socheck_item.inc.php 2012-02-08 08:54:04 UTC
(rev 8807)
@@ -66,7 +66,7 @@
$values = array(
$this->marshal($check_item->get_control_item_id(), 'int'),
- $this->marshal($check_item->get_status(),
'int'),
+ $check_item->get_status(),
$this->marshal($check_item->get_comment(),
'string'),
$this->marshal($check_item->get_check_list_id(), 'int'),
$this->marshal($check_item->get_measurement(),
'int')
@@ -83,7 +83,7 @@
$values = array(
'control_item_id = ' .
$this->marshal($check_item->get_control_item_id(), 'int'),
- 'status = ' .
$this->marshal($check_item->get_status(), 'int'),
+ 'status = ' . $check_item->get_status(),
'comment = ' .
$this->marshal($check_item->get_comment(), 'string'),
'check_list_id = ' .
$this->marshal($check_item->get_check_list_id(), 'int'),
'measurement = ' .
$this->marshal($check_item->get_measurement(), 'string')
@@ -297,7 +297,7 @@
$sql .= "LEFT JOIN controller_control_item as coi ON
ci.control_item_id = coi.id ";
$sql .= "LEFT JOIN controller_check_item_case as cic ON
ci.id = cic.check_item_id ";
$sql .= "WHERE ci.check_list_id = $check_list_id ";
-
+ echo $sql;
if($status == 'open')
$sql .= "AND cic.status = 0 ";
else if($status == 'closed')
Modified: trunk/controller/inc/class.socheck_list.inc.php
===================================================================
--- trunk/controller/inc/class.socheck_list.inc.php 2012-02-08 08:20:37 UTC
(rev 8806)
+++ trunk/controller/inc/class.socheck_list.inc.php 2012-02-08 08:54:04 UTC
(rev 8807)
@@ -686,7 +686,7 @@
$values = array(
'control_id = ' .
$this->marshal($check_list->get_control_id(), 'int'),
'status = ' . $check_list->get_status(),
- 'comment = ' . $check_list->get_comment(),
+ 'comment = ' .
$this->marshal($check_list->get_comment(), 'string'),
'deadline = ' .
$this->marshal($check_list->get_deadline(), 'int'),
'planned_date = ' .
$this->marshal($check_list->get_planned_date(), 'int'),
'completed_date = ' .
$this->marshal($check_list->get_completed_date(), 'int'),
Modified: trunk/controller/inc/class.uicase.inc.php
===================================================================
--- trunk/controller/inc/class.uicase.inc.php 2012-02-08 08:20:37 UTC (rev
8806)
+++ trunk/controller/inc/class.uicase.inc.php 2012-02-08 08:54:04 UTC (rev
8807)
@@ -45,11 +45,12 @@
private $so_control;
var $public_functions = array(
-
'register_case' => true,
-
'create_case_message' => true,
-
'view_case_message' => true,
-
'register_case_message' => true,
-
'updateStatusForCases' => true,
+
'register_case' => true,
+
'create_case_message' => true,
+
'view_case_message' => true,
+
'register_case_message' => true,
+
'register_measurement_case' => true,
+
'updateStatusForCases' => true,
'delete_case' => true
);
@@ -90,7 +91,7 @@
$new_check_item->set_check_list_id(
$check_list_id );
$new_check_item->set_control_item_id(
$control_item_id );
$new_check_item->set_status( 0 );
- $new_check_item->set_comment( "" );
+ $new_check_item->set_comment( null );
$saved_check_item_id =
$this->so_check_item->store( $new_check_item );
$check_item =
$this->so_check_item->get_single($saved_check_item_id);
@@ -116,11 +117,52 @@
$status_checker = new status_checker();
$status_checker->update_check_list_status(
$check_list_id );
- return json_encode( array( "saveStatus" =>
"saved" ) );
+ return json_encode( array( "status" => "saved"
) );
}
else
- return json_encode( array( "saveStatus" =>
"not_saved" ) );
+ return json_encode( array( "status" =>
"not_saved" ) );
+ }
+
+ function register_measurement_case(){
+ $check_list_id = phpgw::get_var('check_list_id');
+ $control_item_id = phpgw::get_var('control_item_id');
+ $case_descr = phpgw::get_var('case_descr');
+ $measurement = phpgw::get_var('measurement');
+ $status = (int)phpgw::get_var('status');
+
+ $check_list =
$this->so_check_list->get_single($check_list_id);
+
+ $control_id = $check_list->get_control_id();
+ $control = $this->so_control->get_single( $control_id );
+ /*
+
+ $db_check_item = $this->so_check_item->get_db();
+ $db_check_item->transaction_begin();
+
+ $db_check_item->transaction_commit();
+ $db_check_item->transaction_abort();
+
+ */
+
+ $new_check_item = new controller_check_item();
+ $new_check_item->set_check_list_id( $check_list_id );
+ $new_check_item->set_control_item_id( $control_item_id
);
+ $new_check_item->set_status( $status );
+ $new_check_item->set_comment($case_descr);
+ $new_check_item->set_measurement($measurement);
+
+ $saved_check_item_id = 0;
+ $saved_check_item_id = $this->so_check_item->store(
$new_check_item );
+
+ if($saved_check_item_id > 0){
+ $status_checker = new status_checker();
+ $status_checker->update_check_list_status(
$check_list_id );
+
+ return json_encode( array( "status" => "saved"
) );
+ }
+ else
+ return json_encode( array( "status" =>
"not_saved" ) );
}
function create_case_message(){
Modified: trunk/controller/inc/class.uicheck_list.inc.php
===================================================================
--- trunk/controller/inc/class.uicheck_list.inc.php 2012-02-08 08:20:37 UTC
(rev 8806)
+++ trunk/controller/inc/class.uicheck_list.inc.php 2012-02-08 08:54:04 UTC
(rev 8807)
@@ -34,10 +34,10 @@
phpgw::import_class('controller.socheck_list');
include_class('controller', 'check_list', 'inc/model/');
+ include_class('controller', 'check_item', 'inc/model/');
include_class('controller', 'date_generator', 'inc/component/');
include_class('controller', 'status_checker', 'inc/helper/');
include_class('controller', 'date_helper', 'inc/helper/');
- include_class('controller', 'check_item', 'inc/model/');
class controller_uicheck_list extends controller_uicommon
{
@@ -409,12 +409,19 @@
$deadline_date = phpgw::get_var('deadline_date');
$completed_date = phpgw::get_var('completed_date');
$planned_date = phpgw::get_var('planned_date');
+
+ if($planned_date != ''){
+ $planned_date_ts =
date_helper::get_timestamp_from_date( $planned_date, "d/m-Y" );
+ }else{
+ $planned_date_ts = 0;
+ }
- $planned_date_ts =
date_helper::get_timestamp_from_date( $planned_date, "d/m-Y" );
- $completed_date_ts =
date_helper::get_timestamp_from_date( $completed_date, "d/m-Y" );
+ if($completed_date != ''){
+ $completed_date_ts =
date_helper::get_timestamp_from_date( $completed_date, "d/m-Y" );
+ }else{
+ $completed_date_ts = 0;
+ }
- echo " comment: " . $comment;
-
// Fetches check_list from DB
$update_check_list =
$this->so->get_single($check_list_id);
$update_check_list->set_status( $status );
@@ -425,9 +432,9 @@
$check_list_id = $this->so->update( $update_check_list
);
if($check_list_id > 0)
- return json_encode( array( "saveStatus" =>
"updated" ) );
+ return json_encode( array( "status" =>
"updated" ) );
else
- return json_encode( array( "saveStatus" =>
"not_updated" ) );
+ return json_encode( array( "status" =>
"not_updated" ) );
}
public function print_check_list(){
@@ -493,29 +500,33 @@
self::render_template_xsl('check_list/view_control_details', $data);
}
+ // Function that displays control items
function register_case(){
$check_list_id = phpgw::get_var('check_list_id');
$check_list = $this->so->get_single($check_list_id);
$control =
$this->so_control->get_single($check_list->get_control_id());
- // Fetches all control items for check list
$control_items_for_check_list = array();
+ $remove_control_item_ids_array = array();
+ // 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");
- $remove_control_item_ids_array = array();
-
+ // 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();
}
}
+ // 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();
+ $control_items_for_check_list[] =
$control_item->toArray();
}
}
@@ -525,14 +536,15 @@
(
'control'
=> $control->toArray(),
'check_list'
=> $check_list->toArray(),
- 'location_array' => $location_array,
+ 'location_array'
=> $location_array,
'control_items_for_check_list' =>
$control_items_for_check_list,
);
-
self::render_template_xsl(array('check_list/check_list_tab_menu',
'check_list/register_case'), $data);
self::add_javascript('controller', 'controller',
'jquery.js');
self::add_javascript('controller', 'controller',
'custom_ui.js');
self::add_javascript('controller', 'controller',
'ajax.js');
+
+
self::render_template_xsl(array('check_list/check_list_tab_menu',
'check_list/register_case'), $data);
}
function view_open_cases(){
@@ -633,9 +645,9 @@
$check_item_id = $this->so_check_item->store(
$check_item_obj );
if($check_item_id > 0)
- return json_encode( array( "saveStatus" =>
"saved" ) );
+ return json_encode( array( "status" => "saved"
) );
else
- return json_encode( array( "saveStatus" =>
"not_saved" ) );
+ return json_encode( array( "status" =>
"not_saved" ) );
}
public function save_check_items(){
@@ -682,7 +694,7 @@
$status_checker = new status_checker();
$status_checker->update_check_list_status(
$check_item->get_check_list_id() );
- return json_encode( array( "saveStatus" =>
"saved" ) );
+ return json_encode( array( "status" => "saved"
) );
}
else
return json_encode( array( "status" =>
"not_saved" ) );
Added: trunk/controller/inc/class.uitest.inc.php
===================================================================
--- trunk/controller/inc/class.uitest.inc.php (rev 0)
+++ trunk/controller/inc/class.uitest.inc.php 2012-02-08 08:54:04 UTC (rev
8807)
@@ -0,0 +1,58 @@
+<?php
+ /**
+ * phpGroupWare - controller: a part of a Facilities Management System.
+ *
+ * @author Erink Holm-Larsen <address@hidden>
+ * @author Torstein Vadla <address@hidden>
+ * @copyright Copyright (C) 2011,2012 Free Software Foundation, Inc.
http://www.fsf.org/
+ * This file is part of phpGroupWare.
+ *
+ * phpGroupWare is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * phpGroupWare is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with phpGroupWare; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
USA
+ *
+ * @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
+ * @internal Development of this application was funded by
http://www.bergen.kommune.no/
+ * @package property
+ * @subpackage controller
+ * @version $Id: class.uicontrol.inc.php 8744 2012-01-31 18:38:02Z vator
$
+ */
+
+ phpgw::import_class('controller.socheck_list');
+
+ include_class('controller', 'control', 'inc/model/');
+ include_class('controller', 'check_list', 'inc/model/');
+
+ class controller_uitest
+ {
+
+ public $public_functions = array
+ (
+ 'index' => true
+ );
+
+ public function index()
+ {
+ $so_check_list =
CreateObject('controller.socheck_list');
+
+ $location_code = "1101";
+ $from_date_ts = "";
+ $end_date_ts = "";
+ $repeat_type = "";
+
+ $control_check_list_array =
$so_check_list->get_check_lists_for_location($location_code, $from_date_ts,
$to_date_ts, $repeat_type);
+
+ print_r( $control_check_list_array );
+ }
+ }
+
\ No newline at end of file
Modified: trunk/controller/inc/component/class.calendar_builder.inc.php
===================================================================
--- trunk/controller/inc/component/class.calendar_builder.inc.php
2012-02-08 08:20:37 UTC (rev 8806)
+++ trunk/controller/inc/component/class.calendar_builder.inc.php
2012-02-08 08:54:04 UTC (rev 8807)
@@ -19,8 +19,6 @@
$calendar_array = $this->init_calendar( $control,
$calendar_array, $num, $period_type );
- echo " Kontroll: " . $control->get_title();
-
// Inserts check_list object on deadline month in
twelve_months_array
foreach($control->get_check_lists_array() as
$check_list){
@@ -29,8 +27,6 @@
$todays_date_ts = mktime(0,0,0,date("m"),
date("d"), date("Y"));
- echo " Dato: " . $check_list->get_id() . "
deadline: " . date("d/m-Y", $check_list->get_deadline());
-
if( $check_list->get_status() == 0 &
$check_list->get_planned_date() > 0 & $check_list->get_deadline() >
$todays_date_ts)
{
$status = "control_planned";
Modified: trunk/controller/inc/component/class.date_generator.inc.php
===================================================================
--- trunk/controller/inc/component/class.date_generator.inc.php 2012-02-08
08:20:37 UTC (rev 8806)
+++ trunk/controller/inc/component/class.date_generator.inc.php 2012-02-08
08:54:04 UTC (rev 8807)
@@ -64,55 +64,58 @@
$interval_date = mktime(0,0,0, date("m",
$interval_date), date("d", $interval_date), date("Y",
$interval_date)+$this->repeat_interval);
}
}
-
}
public function find_control_start_date(){
if( $this->repeat_type == 0 ){
- $search_date = $this->start_date;
+ $control_start_date = $this->start_date;
}
else if( $this->repeat_type == 1 ){
- $search_date = $this->start_date;
+ $control_start_date = $this->start_date;
- while(date("l", $search_date) != "Sunday")
+ while(date("l", $control_start_date) != "Sunday")
{
- $num_days_in_month =
cal_days_in_month(CAL_GREGORIAN, date("m", $search_date), date("y",
$search_date));
+ $num_days_in_month =
cal_days_in_month(CAL_GREGORIAN, date("m", $control_start_date), date("y",
$control_start_date));
- if($num_days_in_month <= date("d",
$search_date) )
+ if($num_days_in_month <= date("d",
$control_start_date) )
{
- $search_date = mktime(0,0,0, date("m",
$search_date)+1, 1, date("Y", $search_date));
+ $control_start_date = mktime(0,0,0,
date("m", $control_start_date)+1, 1, date("Y", $control_start_date));
}
else
{
- $search_date = mktime(0,0,0, date("m",
$search_date), date("d", $search_date)+1, date("Y", $search_date));
+ $control_start_date = mktime(0,0,0,
date("m", $control_start_date), date("d", $control_start_date)+1, date("Y",
$control_start_date));
}
}
}
else if( $this->repeat_type == 2 ){
$num_days_in_month = cal_days_in_month(CAL_GREGORIAN,
date("m", $this->start_date), date("y", $this->start_date));
- $search_date = mktime(0,0,0, date("m",
$this->start_date), $num_days_in_month, date("y", $this->start_date));
+ $control_start_date = mktime(0,0,0, date("m",
$this->start_date), $num_days_in_month, date("y", $this->start_date));
}
else if( $this->repeat_type == 3 ){
$num_days_in_month = cal_days_in_month(CAL_GREGORIAN,
12, date("y", $this->start_date));
- $search_date = mktime(0,0,0, 12, $num_days_in_month,
date("y", $this->start_date));
+ $control_start_date = mktime(0,0,0, 12,
$num_days_in_month, date("y", $this->start_date));
}
- return $search_date;
+ return $control_start_date;
}
- public function find_start_date_for_period( $trail_date ){
-
- while( $trail_date < $this->period_start_date ){
+ public function find_start_date_for_period( $trail_period_start_date ){
+
+ while( $trail_period_start_date < $this->period_start_date ){
- if($this->repeat_type == 1 || $this->repeat_type == 0)
+ if($this->repeat_type == 0)
{
- $trail_date = mktime(0,0,0, date("m",
$trail_date), date("d", $trail_date)+$this->repeat_interval, date("Y",
$trail_date));
+ $trail_period_start_date = mktime(0,0,0,
date("m", $trail_period_start_date), date("d", $trail_period_start_date) +
$this->repeat_interval, date("Y", $trail_period_start_date));
}
+ else if($this->repeat_type == 1)
+ {
+ $trail_period_start_date = mktime(0,0,0,
date("m", $trail_period_start_date), date("d", $trail_period_start_date) +
($this->repeat_interval * 7), date("Y", $trail_period_start_date));
+ }
else if($this->repeat_type == 2)
{
- $month = date("m", $trail_date) +
$this->repeat_interval;
- $year = date("Y", $trail_date);
+ $month = date("m", $trail_period_start_date) +
$this->repeat_interval;
+ $year = date("Y", $trail_period_start_date);
if($month > 12){
$month = $month % 12;
@@ -120,15 +123,15 @@
}
$num_days_in_month =
cal_days_in_month(CAL_GREGORIAN, $month, $year);
- $trail_date = mktime(0,0,0, $month,
$num_days_in_month, $year);
+ $trail_period_start_date = mktime(0,0,0,
$month, $num_days_in_month, $year);
}
else if($this->repeat_type == 3)
{
- $trail_date = mktime(0,0,0, date("m",
$trail_date), date("d", $trail_date), date("Y",
$trail_date)+$this->repeat_interval);
+ $trail_period_start_date = mktime(0,0,0,
date("m", $trail_period_start_date), date("d", $trail_period_start_date),
date("Y", $trail_period_start_date)+$this->repeat_interval);
}
}
- return $trail_date;
+ return $trail_period_start_date;
}
Modified: trunk/controller/js/controller/ajax.js
===================================================================
--- trunk/controller/js/controller/ajax.js 2012-02-08 08:20:37 UTC (rev
8806)
+++ trunk/controller/js/controller/ajax.js 2012-02-08 08:54:04 UTC (rev
8807)
@@ -307,7 +307,7 @@
$(infoBox).hide();
});
- $("#frm_save_check_item").live("submit", function(e){
+ $(".frm_save_check_item").live("submit", function(e){
e.preventDefault();
var thisForm = $(this);
var submitBnt = $(thisForm).find("input[type='submit']");
@@ -320,7 +320,7 @@
if(data){
var obj = jQuery.parseJSON(data);
- if(obj.saveStatus == "saved"){
+ if(obj.status == "saved"){
var submitBnt =
$(thisForm).find("input[type='submit']");
$(submitBnt).val("Lagret");
@@ -349,7 +349,7 @@
if(data){
var obj = jQuery.parseJSON(data);
- if(obj.saveStatus == "saved"){
+ if(obj.status == "saved"){
$(liWrp).fadeOut('3000', function() {
$(liWrp).addClass("hidden");
});
@@ -373,7 +373,7 @@
if(data){
var obj = jQuery.parseJSON(data);
- if(obj.saveStatus == "updated"){
+ if(obj.status == "updated"){
var submitBnt =
$(thisForm).find("input[type='submit']");
$(submitBnt).val("Lagret");
@@ -388,7 +388,7 @@
});
});
- $("#frm_register_case").live("submit", function(e){
+ $(".frm_register_case").live("submit", function(e){
e.preventDefault();
var thisForm = $(this);
@@ -402,7 +402,7 @@
if(data){
var obj = jQuery.parseJSON(data);
- if(obj.saveStatus == "saved"){
+ if(obj.status == "saved"){
var submitBnt =
$(thisForm).find("input[type='submit']");
$(submitBnt).val("Lagret");
@@ -434,6 +434,35 @@
});
});
+ $(".frm_register_measurement_case").live("submit", function(e){
+ e.preventDefault();
+
+ var thisForm = $(this);
+ var thisRow = $(this).parents("li");
+ var submitBnt = $(thisForm).find("input[type='submit']");
+ var requestUrl = $(thisForm).attr("action");
+
+ $.ajax({
+ type: 'POST',
+ url: requestUrl + "&" + $(thisForm).serialize(),
+ success: function(data) {
+ if(data){
+ var obj = jQuery.parseJSON(data);
+
+ if(obj.status == "saved"){
+ var submitBnt =
$(thisForm).find("input[type='submit']");
+ $(submitBnt).val("Lagret");
+
+ // Changes text on save button back
to original
+ window.setTimeout(function() {
+ $(thisRow).remove();
+ }, 1000);
+ }
+ }
+ }
+ });
+ });
+
// Delete a case item from list
$(".delete_case").live("click", function(){
var clickElem = $(this);
@@ -487,17 +516,23 @@
$(submitBnt).removeClass("not_active");
});
- $("#frm_save_check_item").live("click", function(e){
+ $(".frm_save_check_item").live("click", function(e){
var thisForm = $(this);
var submitBnt = $(thisForm).find("input[type='submit']");
$(submitBnt).removeClass("not_active");
});
- $("#frm_register_case").live("click", function(e){
+ $(".frm_register_case").live("click", function(e){
var thisForm = $(this);
var submitBnt = $(thisForm).find("input[type='submit']");
$(submitBnt).removeClass("not_active");
});
+
+ $(".frm_register_measurement_case").live("click", function(e){
+ var thisForm = $(this);
+ var submitBnt = $(thisForm).find("input[type='submit']");
+ $(submitBnt).removeClass("not_active");
+ });
});
Modified: trunk/controller/templates/base/check_list/register_case.xsl
===================================================================
--- trunk/controller/templates/base/check_list/register_case.xsl
2012-02-08 08:20:37 UTC (rev 8806)
+++ trunk/controller/templates/base/check_list/register_case.xsl
2012-02-08 08:54:04 UTC (rev 8807)
@@ -25,7 +25,7 @@
<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
id="frm_register_case"
action="index.php?menuaction=controller.uicase.register_case&phpgw_return_as=json"
method="post">
+ <form
class="frm_register_case"
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>
@@ -46,14 +46,22 @@
</form>
</xsl:when>
<xsl:when
test="type = 'control_item_type_2'">
- <form
id="frm_save_check_item"
action="index.php?menuaction=controller.uicheck_list.save_check_item&phpgw_return_as=json"
method="post">
+ <form
class="frm_register_measurement_case"
action="index.php?menuaction=controller.uicase.register_measurement_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="status" type="hidden" value="1" />
- <input
name="type" type="hidden" value="control_item_type_2" />
- <input
name="check_list_id" type="hidden"><xsl:attribute name="value"><xsl:value-of
select="//check_list/id"/></xsl:attribute></input>
+
<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_2" />
<div
class="check_item">
+
<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>
Modified: trunk/controller/templates/base/check_list/view_measurements.xsl
===================================================================
--- trunk/controller/templates/base/check_list/view_measurements.xsl
2012-02-08 08:20:37 UTC (rev 8806)
+++ trunk/controller/templates/base/check_list/view_measurements.xsl
2012-02-08 08:54:04 UTC (rev 8807)
@@ -18,7 +18,7 @@
<xsl:for-each
select="measurement_check_items">
<li>
<h4><img
src="controller/images/arrow_right.png" width="14"/><span><xsl:value-of
select="control_item/title"/></span></h4>
- <form
id="frm_save_check_item"
action="index.php?menuaction=controller.uicheck_list.save_check_item"
method="post">
+ <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}" />
<input
type="hidden" name="type" value="control_item_type_2" />
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [8807],
Torstein <=