[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [8478]
|
From: |
Torstein |
|
Subject: |
[Fmsystem-commits] [8478] |
|
Date: |
Tue, 03 Jan 2012 12:36:37 +0000 |
Revision: 8478
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8478
Author: vator
Date: 2012-01-03 12:36:37 +0000 (Tue, 03 Jan 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.socontrol_item.inc.php
trunk/controller/inc/class.uicheck_list.inc.php
trunk/controller/inc/class.uicheck_list_for_location.inc.php
trunk/controller/inc/class.uierror_report_message.inc.php
trunk/controller/inc/model/class.check_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
trunk/controller/templates/base/view_calendar_year.xsl
trunk/controller/templates/base/view_error_report_message.xsl
Modified: trunk/controller/inc/class.socheck_item.inc.php
===================================================================
--- trunk/controller/inc/class.socheck_item.inc.php 2012-01-03 11:43:29 UTC
(rev 8477)
+++ trunk/controller/inc/class.socheck_item.inc.php 2012-01-03 12:36:37 UTC
(rev 8478)
@@ -60,7 +60,8 @@
'status',
'comment',
'check_list_id',
- 'message-ticket_id'
+ 'message_ticket_id',
+ 'measurement'
);
$values = array(
@@ -68,7 +69,8 @@
$this->marshal($check_item->get_status(),
'int'),
$this->marshal($check_item->get_comment(),
'string'),
$this->marshal($check_item->get_check_list_id(), 'int'),
-
$this->marshal($check_item->get_message_ticket_id(), 'int')
+
$this->marshal($check_item->get_message_ticket_id(), 'int'),
+ $this->marshal($check_item->get_measurement(),
'int')
);
$result = $this->db->query('INSERT INTO
controller_check_item (' . join(',', $cols) . ') VALUES (' . join(',', $values)
. ')', __LINE__,__FILE__);
@@ -82,10 +84,11 @@
$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'),
- 'message_ticket_id = ' .
$this->marshal($check_item->get_message_ticket_id(), 'int')
+ 'message_ticket_id = ' .
$this->marshal($check_item->get_message_ticket_id(), 'int'),
+ 'measurement = ' .
$this->marshal($check_item->get_measurement(), 'int')
);
$result = $this->db->query('UPDATE
controller_check_item SET ' . join(',', $values) . " WHERE id=$id",
__LINE__,__FILE__);
@@ -132,6 +135,82 @@
return null;
}
}
+
+ public function get_check_items($check_list_id, $status, $type){
+ $sql = "SELECT ci.id as ci_id, ci.status,
control_item_id, ci.comment, ci.message_ticket_id, ci.measurement,
check_list_id, ";
+ $sql .= "coi.id as coi_id, coi.title, coi.required,
coi.what_to_do, coi.how_to_do, coi.control_group_id, coi.type ";
+ $sql .= "FROM controller_check_item ci ";
+ $sql .= "LEFT JOIN controller_control_item as coi ON
ci.control_item_id = coi.id ";
+ $sql .= "WHERE ci.check_list_id = $check_list_id ";
+
+ if($status == 'open')
+ $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);
+
+ while ($this->db->next_record()) {
+ $check_item = new
controller_check_item($this->unmarshal($this->db->f('ci_id', true), 'int'));
+
$check_item->set_control_item_id($this->unmarshal($this->db->f('control_item_id',
true), 'int'));
+
$check_item->set_status($this->unmarshal($this->db->f('status', true), 'bool'));
+
$check_item->set_comment($this->unmarshal($this->db->f('comment', true),
'string'));
+
$check_item->set_check_list_id($this->unmarshal($this->db->f('check_list_id',
true), 'int'));
+
$check_item->set_message_ticket_id($this->unmarshal($this->db->f('message_ticket_id',
true), 'int'));
+
$check_item->set_measurement($this->unmarshal($this->db->f('measurement',
true), 'int'));
+
+ $control_item = new
controller_control_item($this->unmarshal($this->db->f('coi_id', true), 'int'));
+ $control_item->set_title($this->db->f('title',
true), 'string');
+
$control_item->set_required($this->db->f('required', true), 'string');
+
$control_item->set_what_to_do($this->db->f('what_to_do', true), 'string');
+
$control_item->set_how_to_do($this->db->f('how_to_do', true), 'string');
+
$control_item->set_control_group_id($this->db->f('control_group_id', true),
'string');
+ $control_item->set_type($this->db->f('type',
true), 'string');
+
+
$check_item->set_control_item($control_item->toArray());
+
+ $check_items_array[] = $check_item->toArray();
+ }
+
+ return $check_items_array;
+ }
+
+ public function get_check_items_by_message($message_ticket_id){
+ $sql = "SELECT ci.id as ci_id, ci.status,
control_item_id, ci.comment, ci.message_ticket_id, ci.measurement,
check_list_id, ";
+ $sql .= "coi.id as coi_id, coi.title, coi.required,
coi.what_to_do, coi.how_to_do, coi.control_group_id, coi.type ";
+ $sql .= "FROM controller_check_item ci ";
+ $sql .= "LEFT JOIN controller_control_item as coi ON
ci.control_item_id = coi.id ";
+ $sql .= "WHERE ci.message_ticket_id =
$message_ticket_id ";
+
+ $this->db->query($sql);
+
+ while ($this->db->next_record()) {
+ $check_item = new
controller_check_item($this->unmarshal($this->db->f('ci_id', true), 'int'));
+
$check_item->set_control_item_id($this->unmarshal($this->db->f('control_item_id',
true), 'int'));
+
$check_item->set_status($this->unmarshal($this->db->f('status', true), 'bool'));
+
$check_item->set_comment($this->unmarshal($this->db->f('comment', true),
'string'));
+
$check_item->set_check_list_id($this->unmarshal($this->db->f('check_list_id',
true), 'int'));
+
$check_item->set_message_ticket_id($this->unmarshal($this->db->f('message_ticket_id',
true), 'int'));
+
$check_item->set_measurement($this->unmarshal($this->db->f('measurement',
true), 'int'));
+
+ $control_item = new
controller_control_item($this->unmarshal($this->db->f('coi_id', true), 'int'));
+ $control_item->set_title($this->db->f('title',
true), 'string');
+
$control_item->set_required($this->db->f('required', true), 'string');
+
$control_item->set_what_to_do($this->db->f('what_to_do', true), 'string');
+
$control_item->set_how_to_do($this->db->f('how_to_do', true), 'string');
+
$control_item->set_control_group_id($this->db->f('control_group_id', true),
'string');
+ $control_item->set_type($this->db->f('type',
true), 'string');
+
+
$check_item->set_control_item($control_item->toArray());
+
+ $check_items_array[] = $check_item->toArray();
+ }
+
+ return $check_items_array;
+ }
function get_id_field_name(){}
}
Modified: trunk/controller/inc/class.socheck_list.inc.php
===================================================================
--- trunk/controller/inc/class.socheck_list.inc.php 2012-01-03 11:43:29 UTC
(rev 8477)
+++ trunk/controller/inc/class.socheck_list.inc.php 2012-01-03 12:36:37 UTC
(rev 8478)
@@ -51,7 +51,13 @@
}
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,
completed_date, location_code, ci.id as ci_id, ci.status as ci_status,
control_item_id, ci.comment as ci_comment, check_list_id FROM
controller_check_list cl, controller_check_item ci WHERE cl.id = $check_list_id
AND cl.id = ci.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, 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 ";
+ $sql .= "WHERE cl.id = $check_list_id";
+
$this->db->query($sql);
$counter = 0;
@@ -90,9 +96,9 @@
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 .= "ci.id as ci_id, ci.status as ci_status,
control_item_id, ci.comment as ci_comment, ci.measurement, check_list_id, ";
$sql .= "coi.title as coi_id, coi.title as coi_title,
coi.required as coi_required, 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 ";
+ $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 ";
$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 ";
@@ -105,9 +111,7 @@
if($type != null)
$sql .= "AND coi.type = '$type'";
-
-
-
+
$this->db->query($sql);
$counter = 0;
@@ -132,6 +136,8 @@
$check_item->set_status($this->unmarshal($this->db->f('ci_status', true),
'bool'));
$check_item->set_comment($this->unmarshal($this->db->f('ci_comment', true),
'string'));
$check_item->set_check_list_id($this->unmarshal($this->db->f('check_list_id',
true), 'int'));
+
$check_item->set_message_ticket_id($this->unmarshal($this->db->f('message_ticket_id',
true), 'int'));
+
$check_item->set_measurement($this->unmarshal($this->db->f('measurement',
true), 'int'));
$control_item = new
controller_control_item($this->unmarshal($this->db->f('coi_id', true), 'int'));
$control_item->set_title($this->db->f('coi_title', true), 'string');
@@ -139,6 +145,7 @@
$control_item->set_what_to_do($this->db->f('coi_what_to_do', true), 'string');
$control_item->set_how_to_do($this->db->f('coi_how_to_do', true), 'string');
$control_item->set_control_group_id($this->db->f('coi_control_group_id', true),
'string');
+ $control_item->set_type($this->db->f('type',
true), 'string');
$check_item->set_control_item($control_item->toArray());
Modified: trunk/controller/inc/class.socontrol_item.inc.php
===================================================================
--- trunk/controller/inc/class.socontrol_item.inc.php 2012-01-03 11:43:29 UTC
(rev 8477)
+++ trunk/controller/inc/class.socontrol_item.inc.php 2012-01-03 12:36:37 UTC
(rev 8478)
@@ -323,6 +323,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_type($this->unmarshal($this->db->f('type', true), 'string'));
$results[] = $control_item;
}
Modified: trunk/controller/inc/class.uicheck_list.inc.php
===================================================================
--- trunk/controller/inc/class.uicheck_list.inc.php 2012-01-03 11:43:29 UTC
(rev 8477)
+++ trunk/controller/inc/class.uicheck_list.inc.php 2012-01-03 12:36:37 UTC
(rev 8478)
@@ -353,13 +353,19 @@
$check_list_id = phpgw::get_var('check_list_id');
$comment = phpgw::get_var('comment');
$status = phpgw::get_var('status');
-
+ $type = phpgw::get_var('type');
+
$check_item_obj = new controller_check_item();
$check_item_obj->set_status($status);
$check_item_obj->set_comment($comment);
$check_item_obj->set_check_list_id($check_list_id);
$check_item_obj->set_control_item_id($control_item_id);
-
+
+ if($type == 'control_item_type_2'){
+ $measurement = phpgw::get_var('measurement');
+ $check_item_obj->set_measurement($measurement);
+ }
+
$check_item_id = $this->so_check_item->store(
$check_item_obj );
if($check_item_id > 0)
Modified: trunk/controller/inc/class.uicheck_list_for_location.inc.php
===================================================================
--- trunk/controller/inc/class.uicheck_list_for_location.inc.php
2012-01-03 11:43:29 UTC (rev 8477)
+++ trunk/controller/inc/class.uicheck_list_for_location.inc.php
2012-01-03 12:36:37 UTC (rev 8478)
@@ -51,6 +51,7 @@
private $so_control;
private $so_check_list;
private $so_control_item;
+ private $so_check_item;
var $public_functions = array(
'index' => true,
@@ -72,6 +73,7 @@
$this->so_control =
CreateObject('controller.socontrol');
$this->so_check_list =
CreateObject('controller.socheck_list');
$this->so_control_item =
CreateObject('controller.socontrol_item');
+ $this->so_check_item =
CreateObject('controller.socheck_item');
$this->type_id =
$this->bo->type_id;
@@ -361,24 +363,39 @@
function edit_check_list_for_location(){
$check_list_id = phpgw::get_var('check_list_id');
+
+ $check_list =
$this->so_check_list->get_single($check_list_id);
+ print_r($check_list);
+ // Fetches with check items
+ $open_check_items =
$this->so_check_item->get_check_items($check_list_id, 'open',
'control_item_type_1');
// 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');
+ $handled_check_items =
$this->so_check_item->get_check_items($check_list_id, 'handled',
'control_item_type_1');
- $location_code =
$open_check_list_with_check_items["location_code"];
+ $location_code = $check_list->get_location_code();
// 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"]);
+ $control_items_for_check_list =
$this->so_control_item->get_control_items_by_control_id($check_list->get_control_id());
- // Puts ids for control items that is registered as
check item in an array
+ // Fetches check items that registeres measurement
+ $measurement_check_items =
$this->so_check_item->get_check_items($check_list_id, null,
'control_item_type_2');
+
+ // Puts ids for control items that is registered as
open check item in an array
$control_item_ids = array();
-
foreach($open_check_list_with_check_items["check_item_array"] as $check_item){
+ foreach($open_check_items as $check_item){
$control_item_ids[] =
$check_item["control_item_id"];
}
+ // Puts ids for control items that is registered as
handled check item in an array
+ foreach($handled_check_items as $check_item){
+ $control_item_ids[] =
$check_item["control_item_id"];
+ }
+
+ // Puts ids for control items that is registered check
item measurements in an array
+ foreach($measurement_check_items as $check_item){
+ $control_item_ids[] =
$check_item["control_item_id"];
+ }
+
// 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){
@@ -386,22 +403,20 @@
$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
(
- '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
+ 'check_list'
=> $check_list->toArray(),
+ 'open_check_items'
=> $open_check_items,
+ 'handled_check_items' =>
$handled_check_items,
+ 'measurement_check_items' =>
$measurement_check_items,
+ 'control_items_not_registered' =>
$control_items_not_registered,
+ 'location_array'
=> $location_array,
+ 'date_format'
=> $date_format
);
self::add_javascript('controller', 'controller',
'jquery.js');
Modified: trunk/controller/inc/class.uierror_report_message.inc.php
===================================================================
--- trunk/controller/inc/class.uierror_report_message.inc.php 2012-01-03
11:43:29 UTC (rev 8477)
+++ trunk/controller/inc/class.uierror_report_message.inc.php 2012-01-03
12:36:37 UTC (rev 8478)
@@ -68,7 +68,7 @@
function create_error_report_message(){
$check_list_id = phpgw::get_var('check_list_id');
- $check_list_with_check_items =
$this->so_check_list->get_single_with_check_items($check_list_id);
+ $check_list_with_check_items =
$this->so_check_list->get_single_with_check_items($check_list_id, null,
'control_item_type_1');
$control_id =
$check_list_with_check_items["control_id"];
$control = $this->so_control->get_single( $control_id );
@@ -110,21 +110,22 @@
$message_title = phpgw::get_var('message_title');
$message_cat_id = phpgw::get_var('message_cat_id');
- $check_list_with_check_items =
$this->so_check_list->get_single_with_check_items($check_list_id);
+ $check_list =
$this->so_check_list->get_single($check_list_id);
- $control_id =
$check_list_with_check_items["control_id"];
+ $control_id = $check_list->get_control_id();
$control = $this->so_control->get_single( $control_id );
- $location_code =
$check_list_with_check_items["location_code"];
+ $location_code = $check_list->get_location_code();
$date_format =
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
$location_array =
execMethod('property.bolocation.read_single', array('location_code' =>
$location_code));
-
+
+ // Generates message details from comment field in
check item
foreach($check_item_ids as $check_item_id){
$check_item =
$this->so_check_item->get_single($check_item_id);
- $details .= "Gjøremål: ";
- $details .= $check_item->get_comment() .
"<br>";
+ $message_details .= "Gjøremål: ";
+ $message_details .= $check_item->get_comment()
. "<br>";
}
$ticket = array
@@ -135,19 +136,22 @@
'cat_id' =>
$message_cat_id,
'priority' => $priority,
//valgfri (1-3)
'title' =>
$message_title,
- 'details' => $details,
+ 'details' =>
$message_details,
'file_input_name' => 'file' // default,
men valgfri
);
$botts = CreateObject('property.botts',true);
$message_ticket_id = $botts->add_ticket($ticket);
+ // Registers message and updates check items with
message ticket id
foreach($check_item_ids as $check_item_id){
$check_item =
$this->so_check_item->get_single($check_item_id);
$check_item->set_message_ticket_id(
$message_ticket_id );
$this->so_check_item->update($check_item);
}
+ $registered_message_check_items =
$this->so_check_item->get_check_items_by_message($message_ticket_id);
+
$message_ticket =
$botts->read_single($message_ticket_id);
$catsObj = CreateObject('phpgwapi.categories', -1,
'property', '.ticket');
@@ -157,12 +161,13 @@
$data = array
(
- 'message_ticket' =>
$message_ticket,
- 'category' =>
$category[0]['name'],
- 'location_array' =>
$location_array,
- 'control_array' =>
$control->toArray(),
- 'check_list' =>
$check_list_with_check_items,
- 'date_format' => $date_format
+ 'message_ticket'
=> $message_ticket,
+ 'category'
=> $category[0]['name'],
+ 'location_array'
=> $location_array,
+ 'control_array'
=> $control->toArray(),
+ 'check_list'
=> $check_list->toArray(),
+ 'registered_message_check_items' =>
$registered_message_check_items,
+ '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-03 11:43:29 UTC
(rev 8477)
+++ trunk/controller/inc/model/class.check_item.inc.php 2012-01-03 12:36:37 UTC
(rev 8478)
@@ -72,10 +72,10 @@
public function set_status($status)
{
- $this->status = $status;
+ $this->status = (int)$status;
}
- public function get_status() { return $this->status; }
+ public function get_status() { return (int)$this->status; }
public function set_comment($comment)
{
Modified: trunk/controller/templates/base/create_error_report_message.xsl
===================================================================
--- trunk/controller/templates/base/create_error_report_message.xsl
2012-01-03 11:43:29 UTC (rev 8477)
+++ trunk/controller/templates/base/create_error_report_message.xsl
2012-01-03 12:36:37 UTC (rev 8478)
@@ -4,24 +4,28 @@
<div id="main_content">
- <h1>Send avviksmelding</h1>
+ <h1>Registrer avviksmelding</h1>
+ <div class="tab_menu">
+ <a class="active" href="#">Meldingen gjelder</a>
+ </div>
<div id="error_report_message_details">
- <h3>Bygg: <xsl:value-of
select="location_array/loc1_name"/></h3>
- <h3>Tittel på kontroll: <xsl:value-of
select="control_array/title"/></h3>
+ <h3 class="first">Tittel på kontroll: <xsl:value-of
select="control_array/title"/></h3>
<xsl:choose>
<xsl:when test="check_list/completed_date != 0">
- <h3>Kontroll ble utført dato:
<xsl:value-of select="php:function('date', $date_format,
number(check_list/completed_date))"/></h3>
+ <h3>Kontroll ble utført
dato:<xsl:value-of select="php:function('date', $date_format,
number(check_list/completed_date))"/></h3>
</xsl:when>
<xsl:otherwise>
- <h3>Kontroll ble utført dato: Ikke
registrert utført</h3>
+ <h3>Kontroll ble utført dato: Ikke
registrert utført</h3>
</xsl:otherwise>
</xsl:choose>
+ <h3 class="last">Bygg: <xsl:value-of
select="location_array/loc1_name"/></h3>
</div>
-
+
+ <div class="tab_menu">
+ <a class="active" href="#">Detaljer for meldingen</a>
+ </div>
<fieldset id="error_report_message_details">
-
-
<xsl:choose>
<xsl:when
test="check_list/check_item_array/child::node()">
@@ -42,12 +46,12 @@
</input>
<div>
- <label style="font-size:
15px;font-weight: bold;">Tittel på melding</label>
+ <label>Tittel på melding</label>
<input name="message_title"
type="text" />
</div>
<div>
- <label style="font-size:
15px;font-weight: bold;">Kategori</label>
+ <label>Kategori</label>
<select name="message_cat_id">
<option value="0">Velg
kategori</option>
<xsl:for-each
select="categories/cat_list">
@@ -81,7 +85,14 @@
</xsl:choose>
</fieldset>
-
+ <a class="btn">
+ <xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.edit_check_list_for_location</xsl:text>
+ <xsl:text>&check_list_id=</xsl:text>
+ <xsl:value-of select="check_list/id"/>
+ </xsl:attribute>
+ Vis sjekkliste
+ </a>
</div>
</xsl:template>
Modified: trunk/controller/templates/base/css/base.css
===================================================================
--- trunk/controller/templates/base/css/base.css 2012-01-03 11:43:29 UTC
(rev 8477)
+++ trunk/controller/templates/base/css/base.css 2012-01-03 12:36:37 UTC
(rev 8478)
@@ -819,7 +819,7 @@
}
ul.calendar li div {
float: left;
- width: 24px;
+ width: 30px;
padding: 3px;
text-align: center;
}
@@ -837,6 +837,9 @@
height: 800px;
margin-left: 40px;
}
+ul.calendar.days li div {
+ width: 24px;
+}
ul.calendar.days {
position: absolute;
width: 1120px;
@@ -1011,7 +1014,7 @@
}
.frm_save_check_item input[type='submit']{
- width: 130px;
+ width: 185px;
}
ul.check_items {
width: 625px;
@@ -1019,31 +1022,33 @@
ul.check_items h5{
margin:10px;
- font-size: 12px;
+ font-size: 13px;
}
.tab_menu {
- height: 29px;
overflow: hidden;
}
.tab_menu a {
- background: none repeat scroll 0 0 #FAFAFA;
+ background: none repeat scroll 0 0 #FAFAFA;
+ border-left: 1px solid #A3A3A3;
+ border-right: 1px solid #A3A3A3;
+ border-top: 1px solid #A3A3A3;
color: #000000;
cursor: pointer;
display: block;
- height: 30px;
- width: 130px;
- padding-top: 9px;
- text-align: center;
- text-decoration: none;
- border: 1px solid #A3A3A3;
float: left;
font-size: 12px;
font-weight: normal;
margin-right: 3px;
+ padding: 7px 0;
+ text-align: center;
+ text-decoration: none;
+ width: 150px;
}
.tab_menu a.active {
background: #2647A0;
- border: none;
+ border-left: 1px solid #173073;
+ border-right: 1px solid #173073;
+ border-top: 1px solid #173073;
color: #FFF;
}
.tab_item {
@@ -1104,14 +1109,27 @@
#main_content #error_report_message_details {
background: none repeat scroll 0 0 #EDF5FF;
border: 1px solid #DDDDDD;
- margin: 20px 0;
+ margin-bottom: 20px;
padding: 15px;
width: 800px;
}
#error_report_message_details label{
display: inline-block;
- width: 130px;
+ width: 130px;
+ font-weight: normal;
+ font-size: 15px;
}
+#error_report_message_details h3 {
+ font-size: 15px;
+ font-weight: normal;
+ margin: 10px 0;
+}
+#error_report_message_details h3.first {
+ margin-top:0;
+}
+#error_report_message_details h3.last {
+ margin-bottom:0;
+}
.btn{
background: none repeat scroll 0 0 #2647A0;
color: #FFFFFF;
@@ -1144,4 +1162,8 @@
display:none;
float: right;
margin-top: 20px;
+}
+
+a#view_errors_measurements{
+ display:none;
}
\ No newline at end of file
Modified: trunk/controller/templates/base/edit_check_list.xsl
===================================================================
--- trunk/controller/templates/base/edit_check_list.xsl 2012-01-03 11:43:29 UTC
(rev 8477)
+++ trunk/controller/templates/base/edit_check_list.xsl 2012-01-03 12:36:37 UTC
(rev 8478)
@@ -27,13 +27,13 @@
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");
+ var hideId =
$(thisTabMenu).find("a.active").attr("href");
+
+ $(thisTabMenu).find("a").removeClass("active");
$(thisTabA).addClass('active');
-
+
$(hideId).hide();
+ $(hideId).removeClass("active")
$(showId).fadeIn('10', function(){
$(showId).addClass('active');
@@ -49,40 +49,55 @@
$(hideId).hide();
$(showId).fadeIn('10');
- $(thisA).fadeOut('10');
-
+ $(thisA).hide();
+ $("a#view_errors_measurements").css("display",
"block");
+
return false;
});
+ $("#view_errors_measurements").click(function(){
+ var thisA = $(this);
+ var showId = $(thisA).attr("href");
+ var hideId = "#register_errors";
+
+ $(hideId).hide();
+ $(showId).fadeIn('10');
+ $(thisA).hide();
+ $("a#reg_errors").css("display", "block");
+
+ return false;
+ });
+
});
</script>
- <h1>Endre sjekkliste for <xsl:value-of
select="location_array/loc1_name"/></h1>
+ <h1>Sjekkliste for <xsl:value-of
select="location_array/loc1_name"/></h1>
+ <div class="tab_menu"><a class="active">Detaljer</a></div>
<fieldset class="check_list_details">
<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="open_check_list_with_check_items/id"/></xsl:variable>
+ <xsl:variable name="check_list_id"><xsl:value-of
select="check_list/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="open_check_list_with_check_items/id"/></xsl:attribute>
+ <xsl:attribute name="value"><xsl:value-of
select="check_list/id"/></xsl:attribute>
</input>
</div>
<div>
<label>Status</label>
- <xsl:variable name="status"><xsl:value-of
select="open_check_list_with_check_items/status"/></xsl:variable>
+ <xsl:variable name="status"><xsl:value-of
select="check_list/status"/></xsl:variable>
<select name="status">
<xsl:choose>
- <xsl:when
test="open_check_list_with_check_items/status = 0">
+ <xsl:when
test="check_list/status = 0">
<option value="0"
SELECTED="SELECTED">Ikke utført</option>
<option value="1"
>Utført</option>
</xsl:when>
- <xsl:when
test="open_check_list_with_check_items/status = 1">
+ <xsl:when
test="check_list/status = 1">
<option value="0">Ikke
utført</option>
<option value="1"
SELECTED="SELECTED">Utført</option>
</xsl:when>
@@ -95,8 +110,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="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 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>
</input>
</div>
@@ -106,8 +121,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="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 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>
</input>
</div>
@@ -117,8 +132,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="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 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>
</input>
</div>
@@ -126,13 +141,13 @@
<label class="comment">Kommentar</label>
<textarea>
<xsl:attribute
name="name">comment</xsl:attribute>
- <xsl:value-of
select="open_check_list_with_check_items/comment"/>
+ <xsl:value-of select="check_list/comment"/>
</textarea>
</div>
<div class="form-buttons">
<xsl:variable name="lang_save"><xsl:value-of
select="php:function('lang', 'save_check_list')" /></xsl:variable>
- <input class="btn not_active" type="submit"
name="save_control" value="{$lang_save}" title="{$lang_save}" />
+ <input style="width: 170px;" class="btn
not_active" type="submit" name="save_control" value="Lagre detaljer" />
</div>
</form>
</fieldset>
@@ -145,24 +160,32 @@
<xsl:attribute name="href">
<xsl:text>#register_errors</xsl:text>
</xsl:attribute>
- Registrer avvik
+ Registrer avvik/måling
</a>
<a class="btn">
+ <xsl:attribute name="id">
+
<xsl:text>view_errors_measurements</xsl:text>
+ </xsl:attribute>
<xsl:attribute name="href">
+ <xsl:text>#view_errors</xsl:text>
+ </xsl:attribute>
+ Vis avvik/måling
+ </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:value-of select="check_list/id"/>
</xsl:attribute>
Send avviksmelding
</a>
</div>
<div id="register_errors">
- <div class="tab_menu"><a class="active">Registrer
avvik</a></div>
+ <div class="tab_menu"><a class="active">Registrer
avvik/måling</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_not_registered/child::node()">
@@ -173,58 +196,64 @@
<form
class="frm_save_control_item"
action="index.php?menuaction=controller.uicheck_list.add_check_item_to_list"
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>
-
<xsl:attribute name="name">check_list_id</xsl:attribute>
-
<xsl:attribute name="type">hidden</xsl:attribute>
+ <input
name="check_list_id" type="hidden">
<xsl:attribute name="value">
-
<xsl:value-of select="//open_check_list_with_check_items/id"/>
+
<xsl:value-of select="//check_list/id"/>
</xsl:attribute>
</input>
- <input>
-
<xsl:attribute name="name">status</xsl:attribute>
-
<xsl:attribute name="type">hidden</xsl:attribute>
-
<xsl:attribute name="value">
-
<xsl:value-of select="0"/>
-
</xsl:attribute>
- </input>
-
- <div
class="check_item">
- <div>
- <label
class="comment">Påkrevd</label>
-
<input>
-
<xsl:attribute name="name">required</xsl:attribute>
-
<xsl:attribute name="type">checkbox</xsl:attribute>
-
<xsl:attribute name="value">
-
<xsl:value-of select="required"/>
-
</xsl:attribute>
-
</input>
- </div>
- <div>
-
<label class="comment">Kommentar</label>
-
<textarea name="comment">
-
<xsl:value-of select="comment"/>
-
</textarea>
+ <input
name="status" type="hidden" value="0" />
+
+ <xsl:choose>
+
<xsl:when test="type = 'control_item_type_1'">
+
<input name="type" type="hidden" value="control_item_type_1" />
+
+
<div class="check_item">
+
<div>
+
<label class="comment">Kommentar</label>
+
<textarea name="comment">
+
<xsl:value-of select="comment"/>
+
</textarea>
+
</div>
+
<div class="form-buttons">
+
<xsl:variable name="lang_save"><xsl:value-of
select="php:function('lang', 'register_error')" /></xsl:variable>
+
<input type="submit" name="save_control" value="{$lang_save}"
class="not_active" title="{$lang_save}" />
+
</div>
+
</div>
+
</xsl:when>
+
<xsl:when test="type = 'control_item_type_2'">
+
<input name="type" type="hidden" value="control_item_type_2" />
+
<div class="check_item">
+
<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
style="vertical-align:top">Hva skal gjøres</label>
-
<textarea><xsl:value-of select="control_item/what_to_do"/></textarea>
- </div>
- <div>
- <label
style="vertical-align:top">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', 'register_error')" /></xsl:variable>
-
<input type="submit" name="save_control" value="{$lang_save}"
class="not_active" title="{$lang_save}" />
+
<div>
+
<label class="comment">Kommentar</label>
+
<textarea name="comment">
+
<xsl:value-of select="comment"/>
+
</textarea>
+
</div>
+
<div class="form-buttons">
+
<xsl:variable name="lang_save"><xsl:value-of
select="php:function('lang', 'register_error')" /></xsl:variable>
+
<input type="submit" name="save_control" value="Registrer
avvik" class="not_active" title="{$lang_save}" />
+
</div>
</div>
- </div>
+
</xsl:when>
+ </xsl:choose>
+
</form>
</li>
</xsl:for-each>
</ul>
</xsl:when>
<xsl:otherwise>
- Ingen sjekkpunkter
+ Alle sjekkpunkter for kontroll
er registert som åpent/håndtert avvik eller måling
</xsl:otherwise>
</xsl:choose>
</div>
@@ -240,12 +269,12 @@
<div id="view_open_errors" class="tab_item active">
<xsl:choose>
- <xsl:when
test="open_check_list_with_check_items/check_item_array/child::node()">
+ <xsl:when test="open_check_items/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="open_check_list_with_check_items/check_item_array">
+ <xsl:for-each
select="open_check_items">
<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>
@@ -274,17 +303,9 @@
<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}" />
+
<input style="width: 200px;" type="submit" name="save_control"
value="Oppdater registrert avvik" class="not_active" title="{$lang_save}" />
</div>
</div>
</form>
@@ -301,12 +322,12 @@
<div id="view_handled_errors" class="tab_item">
<xsl:choose>
- <xsl:when
test="handled_check_list_with_check_items/check_item_array/child::node()">
+ <xsl:when
test="handled_check_items/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="handled_check_list_with_check_items/check_item_array">
+ <xsl:for-each
select="handled_check_items">
<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>
@@ -335,17 +356,9 @@
<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}" />
+
<input type="submit" name="save_control" value="Oppdater
håndtert avvik" class="not_active" title="{$lang_save}" />
</div>
</div>
</form>
@@ -362,51 +375,41 @@
<div id="view_measurements" class="tab_item">
<xsl:choose>
- <xsl:when
test="measurement_check_items/check_item_array/child::node()">
+ <xsl:when
test="measurement_check_items/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">
+ <xsl:for-each
select="measurement_check_items">
<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}" />
+
<input type="hidden" name="check_item_id" value="{$check_item_id}" />
+
<input type="hidden" name="type" value="measurement" />
+
<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>
+
<label>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">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}" />
+
<input type="submit" name="save_control" value="Oppdatert
registert måling" class="not_active" title="{$lang_save}" />
</div>
</div>
</form>
Modified: trunk/controller/templates/base/view_calendar_year.xsl
===================================================================
--- trunk/controller/templates/base/view_calendar_year.xsl 2012-01-03
11:43:29 UTC (rev 8477)
+++ trunk/controller/templates/base/view_calendar_year.xsl 2012-01-03
12:36:37 UTC (rev 8478)
@@ -14,14 +14,13 @@
</fieldset>
</div>
- <ul id="icon_color_map">
- <li><img height="15"
src="controller/images/status_icon_yellow.png" /><span>Kontroll satt
opp</span></li>
- <li><img height="15"
src="controller/images/status_icon_light_green.png" /><span>Kontroll har
planlagt dato</span></li>
- <li><img height="15"
src="controller/images/status_icon_dark_green.png" /><span>Kontroll gjennomført
uten feil</span></li>
- <li><img height="15"
src="controller/images/status_icon_light_blue.png" /><span>Kontroll gjennomført
uten feil før frist</span></li>
- <li><img height="15"
src="controller/images/status_icon_dark_blue.png" /><span>Kontroll gjennomført
uten feil etter frist</span></li>
- <li><img height="15"
src="controller/images/status_icon_red.png" /><span>Kontroll gjennomført med
rapporterte feil</span></li>
- <li><img height="12"
src="controller/images/status_icon_red_cross.png" /><span>Kontroll ikke
gjennomført</span></li>
+ <ul id="icon_color_map">
+ <li><img height="13"
src="controller/images/status_icon_yellow_ring.png" /><span>Kontroll satt
opp</span></li>
+ <li><img height="13"
src="controller/images/status_icon_yellow.png" /><span>Kontroll har planlagt
dato</span></li>
+ <li><img height="13"
src="controller/images/status_icon_dark_green.png" /><span>Kontroll gjennomført
uten feil før frist</span></li>
+ <li><img height="13"
src="controller/images/status_icon_light_green.png" /><span>Kontroll
gjennomført uten feil etter frist</span></li>
+ <li><img height="13"
src="controller/images/status_icon_red_empty.png" /><span>Kontroll gjennomført
med rapporterte feil</span></li>
+ <li><img height="11"
src="controller/images/status_icon_red_cross.png" /><span>Kontroll ikke
gjennomført</span></li>
</ul>
<ul class="calendar">
@@ -96,7 +95,7 @@
<xsl:text>&location_code=</xsl:text>
<xsl:value-of select="$location_code"/>
</xsl:attribute>
-
<img height="15" src="controller/images/status_icon_yellow.png" />
+
<img height="15" src="controller/images/status_icon_yellow_ring.png" />
</a>
</div>
</xsl:when>
@@ -108,7 +107,7 @@
<xsl:text>&check_list_id=</xsl:text>
<xsl:value-of select="info/check_list_id"/>
</xsl:attribute>
-
<img height="15" src="controller/images/status_icon_light_green.png" />
+
<img height="15" src="controller/images/status_icon_yellow.png" />
</a>
</div>
</xsl:when>
Modified: trunk/controller/templates/base/view_error_report_message.xsl
===================================================================
--- trunk/controller/templates/base/view_error_report_message.xsl
2012-01-03 11:43:29 UTC (rev 8477)
+++ trunk/controller/templates/base/view_error_report_message.xsl
2012-01-03 12:36:37 UTC (rev 8478)
@@ -4,9 +4,11 @@
<div id="main_content">
- <h1>Send avviksmelding</h1>
+ <h1>Avviksmelding registrert</h1>
- <h3>Følgende meldingsdata ble sendt</h3>
+ <div class="tab_menu">
+ <a class="active" href="#">Meldingen gjaldt</a>
+ </div>
<div id="error_report_message_details">
<h3>Bygg: <xsl:value-of
select="location_array/loc1_name"/></h3>
<h3>Tittel på kontroll: <xsl:value-of
select="control_array/title"/></h3>
@@ -19,53 +21,31 @@
</xsl:otherwise>
</xsl:choose>
</div>
-
+
+ <div class="tab_menu">
+ <a class="active" href="#">Detaljer for melding</a>
+ </div>
<div id="error_report_message_details">
- <xsl:choose>
- <xsl:when
test="check_list/check_item_array/child::node()">
-
- <form class="frm_save_error_report_message"
action="index.php?menuaction=controller.uierror_report_message.save_error_report_message"
method="post">
- <input>
- <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:attribute>
- </input>
- <input>
- <xsl:attribute
name="name">location_code</xsl:attribute>
- <xsl:attribute
name="type">hidden</xsl:attribute>
- <xsl:attribute name="value">
- <xsl:value-of
select="location_array/location_code"/>
- </xsl:attribute>
- </input>
+ <div>
+ <label>Tittel på melding</label>
+ <xsl:value-of select="message_ticket/subject"/>
+ </div>
- <div>
- <label style="font-size:
15px;font-weight: bold;">Tittel på melding</label>
- <xsl:value-of
select="message_ticket/subject"/>
- </div>
-
- <div>
- <label style="font-size:
15px;font-weight: bold;">Kategori</label>
- <span><xsl:value-of
select="category"/></span>
- </div>
-
-
- <h3
class="check_item_details">Avviksmeldingen omfattet følgende sjekkpunkter</h3>
- <ul class="check_items">
- <xsl:for-each
select="check_list/check_item_array">
- <li>
- <xsl:variable
name="check_item_id"><xsl:value-of select="id" /></xsl:variable>
-
<h5><xsl:value-of select="control_item/title"/></h5>
- </li>
- </xsl:for-each>
- </ul>
- </form>
- </xsl:when>
- <xsl:otherwise>
- Ingen sjekkpunkter
- </xsl:otherwise>
- </xsl:choose>
+ <div>
+ <label>Kategori</label>
+ <span><xsl:value-of select="category"/></span>
+ </div>
+
+
+ <h3 class="check_item_details">Avviksmeldingen omfattet
følgende punkter</h3>
+ <ul class="check_items">
+ <xsl:for-each
select="registered_message_check_items">
+ <li>
+ <xsl:variable
name="check_item_id"><xsl:value-of select="id" /></xsl:variable>
+ <h5><xsl:value-of
select="control_item/title"/></h5>
+ </li>
+ </xsl:for-each>
+ </ul>
</div>
<a class="btn">
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [8478],
Torstein <=