[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [8598]
|
From: |
Torstein |
|
Subject: |
[Fmsystem-commits] [8598] |
|
Date: |
Tue, 17 Jan 2012 16:50:23 +0000 |
Revision: 8598
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8598
Author: vator
Date: 2012-01-17 16:50:22 +0000 (Tue, 17 Jan 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/controller/inc/class.socheck_item.inc.php
trunk/controller/inc/class.socontrol.inc.php
trunk/controller/inc/class.socontrol_item.inc.php
trunk/controller/inc/class.socontrol_item_list.inc.php
trunk/controller/inc/class.uicalendar.inc.php
trunk/controller/inc/class.uicase.inc.php
trunk/controller/inc/class.uicheck_list.inc.php
trunk/controller/inc/class.uicheck_list_for_location.inc.php
trunk/controller/inc/class.uicontrol.inc.php
trunk/controller/inc/component/class.calendar_builder.inc.php
trunk/controller/templates/base/calendar/view_calendar_month.xsl
trunk/controller/templates/base/calendar/view_calendar_year.xsl
trunk/controller/templates/base/check_list/register_case.xsl
Added Paths:
-----------
trunk/controller/templates/base/check_list/add_check_list.xsl
Removed Paths:
-------------
trunk/controller/templates/base/check_list/add_check_list_for_location.xsl
Modified: trunk/controller/inc/class.socheck_item.inc.php
===================================================================
--- trunk/controller/inc/class.socheck_item.inc.php 2012-01-17 13:20:45 UTC
(rev 8597)
+++ trunk/controller/inc/class.socheck_item.inc.php 2012-01-17 16:50:22 UTC
(rev 8598)
@@ -61,7 +61,6 @@
'status',
'comment',
'check_list_id',
- 'message_ticket_id',
'measurement'
);
@@ -258,7 +257,7 @@
if($type != null)
$sql .= "AND coi.type = '$type'";
-
+
$this->db->query($sql);
while ($this->db->next_record()) {
Modified: trunk/controller/inc/class.socontrol.inc.php
===================================================================
--- trunk/controller/inc/class.socontrol.inc.php 2012-01-17 13:20:45 UTC
(rev 8597)
+++ trunk/controller/inc/class.socontrol.inc.php 2012-01-17 16:50:22 UTC
(rev 8598)
@@ -108,7 +108,7 @@
}
// Kommenterte denne ut midlertidig.
- //Trenger id-en som ble lagret når controllen blir
lagret.
+ //Trenger id-en når controllen blir lagret.
//return isset($result);
}
Modified: trunk/controller/inc/class.socontrol_item.inc.php
===================================================================
--- trunk/controller/inc/class.socontrol_item.inc.php 2012-01-17 13:20:45 UTC
(rev 8597)
+++ trunk/controller/inc/class.socontrol_item.inc.php 2012-01-17 16:50:22 UTC
(rev 8598)
@@ -267,12 +267,12 @@
return "SELECT {$cols} FROM {$tables} {$joins} WHERE
{$condition} {$order}";
}
- function get_control_items($control_group_id)
+ function get_control_items($control_group_id, $return_type =
"return_object")
{
$results = array();
$sql = "SELECT * FROM controller_control_item WHERE
control_group_id={$control_group_id}";
- $this->db->limit_query($sql, $start, __LINE__,
__FILE__, $limit);
+ $this->db->query($sql);
while ($this->db->next_record()) {
$control_item = new
controller_control_item($this->unmarshal($this->db->f('id', true), 'int'));
@@ -282,33 +282,15 @@
$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'));
- $results[] = $control_item;
+ if($return_type == "return_object")
+ $results[] = $control_item;
+ else
+ $results[] = $control_item->toArray();
}
return $results;
}
- function get_control_items_as_array($control_group_id)
- {
- $results = array();
-
- $sql = "SELECT * FROM controller_control_item WHERE
control_group_id=$control_group_id";
- $this->db->limit_query($sql, $start, __LINE__,
__FILE__, $limit);
-
- while ($this->db->next_record()) {
- $control_item = new
controller_control_item($this->unmarshal($this->db->f('id', true), 'int'));
-
$control_item->set_title($this->unmarshal($this->db->f('title', true),
'string'));
-
$control_item->set_required($this->unmarshal($this->db->f('required', true),
'boolean'));
-
$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'));
-
- $results[] = $control_item->toArray();
- }
-
- return $results;
- }
-
function get_control_items_by_control($control_id, $returnType
= "return_object")
{
$results = array();
Modified: trunk/controller/inc/class.socontrol_item_list.inc.php
===================================================================
--- trunk/controller/inc/class.socontrol_item_list.inc.php 2012-01-17
13:20:45 UTC (rev 8597)
+++ trunk/controller/inc/class.socontrol_item_list.inc.php 2012-01-17
16:50:22 UTC (rev 8598)
@@ -147,25 +147,10 @@
return isset($result);
}
- function get_control_item_array($start = 0, $results = 1000,
$sort = null, $dir = '', $query = null, $search_option = null, $filters =
array()){}
+ function get_id_field_name($extended_info = false){}
- function get_id_field_name($extended_info = false)
- {
- }
+ protected function get_query(string $sort_field, boolean
$ascending, string $search_for, string $search_type, array $filters, boolean
$return_count){}
- protected function get_query(string $sort_field, boolean
$ascending, string $search_for, string $search_type, array $filters, boolean
$return_count)
- {
+ function populate(int $control_item_id, &$control_item){}
- }
-
- function get_control_items($control_group_id)
- {
-
- }
-
- function populate(int $control_item_id, &$control_item)
- {
-
- }
-
}
Modified: trunk/controller/inc/class.uicalendar.inc.php
===================================================================
--- trunk/controller/inc/class.uicalendar.inc.php 2012-01-17 13:20:45 UTC
(rev 8597)
+++ trunk/controller/inc/class.uicalendar.inc.php 2012-01-17 16:50:22 UTC
(rev 8598)
@@ -179,14 +179,14 @@
$criteria = array
(
'user_id' =>
$GLOBALS['phpgw_info']['user']['account_id'],
- 'type_id' => 2,
+ 'type_id' => 1,
'role_id' => 0, // For å begrense til en
bestemt rolle - ellers listes alle roller for brukeren
'allrows' => false
);
$location_finder = new location_finder();
$locations = $location_finder->get_responsibilities(
$criteria );
-print_r($locations);
+
$repeat_type = null;
$controls_for_location_array =
$this->so_control->get_controls_by_location($location_code, $from_date_ts,
$to_date_ts, $repeat_type );
@@ -196,14 +196,14 @@
foreach($controls_for_location_array as $control){
if($control->get_repeat_type() == 0){
-
+
$twelve_month_array = array();
+
+ $trail_year = $year;
- $cal_to_year = $year;
-
for($from_month=1;$from_month<=12;$from_month++){
-
- $from_date_ts =
strtotime("$from_month/01/$cal_to_year");
+
+ $trail_from_date_ts =
strtotime("$from_month/01/$trail_year");
if(($from_month + 1) > 12)
{
@@ -215,17 +215,23 @@
$to_month = $from_month
+ 1;
}
- $to_date_ts =
strtotime("$to_month/01/$cal_to_year");
+ $trail_to_date_ts =
strtotime("$to_month/01/$trail_year");
$num_open_cases_for_control_array = array();
-
$num_open_cases_for_control_array = $this->so->get_num_open_cases_for_control(
$control->get_id(), $location_code, $from_date_ts, $to_date_ts );
-
-
$twelve_month_array[$from_month-1] = $num_open_cases_for_control_array;
+
$num_open_cases_for_control_array =
$this->so_check_list->get_num_open_cases_for_control( $control->get_id(),
$location_code, $trail_from_date_ts, $trail_to_date_ts );
+
+ $status =
"control_agg_accomplished_with_errors";
+
+
$twelve_month_array[$from_month-1]["status"] = $status;
+
$twelve_month_array[$from_month-1]["info"] =
$num_open_cases_for_control_array["count"];
+
}
- $days_controls_calendar_array =
$this->calendar_builder->build_agg_calendar_array( $agg_check_list_array );
+ $days_controls_calendar_array[] =
array("control" => $control->toArray(), "calendar_array" =>
$twelve_month_array);
}
+
}
+
$repeat_type = 2;
$control_check_list_array =
$this->so->get_check_lists_for_location( $location_code, $from_date_ts,
$to_date_ts, $repeat_type );
@@ -233,7 +239,7 @@
$month_controls_calendar_array =
$this->calendar_builder->build_calendar_array( $control_check_list_array, 12,
"view_months" );
$controls_calendar_array =
array_merge($days_controls_calendar_array, $month_controls_calendar_array);
-
+ print_r($controls_calendar_array);
$location_array =
execMethod('property.bolocation.read_single', array('location_code' =>
$location_code));
$heading_array = array("Jan", "Feb", "Mar", "Apr",
"Mai", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Des");
Modified: trunk/controller/inc/class.uicase.inc.php
===================================================================
--- trunk/controller/inc/class.uicase.inc.php 2012-01-17 13:20:45 UTC (rev
8597)
+++ trunk/controller/inc/class.uicase.inc.php 2012-01-17 16:50:22 UTC (rev
8598)
@@ -74,6 +74,17 @@
$check_item =
$this->so_check_item->get_check_item_by_check_list_and_control_item($check_list_id,
$control_item_id);
+ if($check_item == null){
+ $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( 0 );
+ $new_check_item->set_comment( "" );
+
+ $saved_check_item_id =
$this->so_check_item->store( $new_check_item );
+ $check_item =
$this->so_check_item->get_single($saved_check_item_id);
+ }
+
$todays_date = mktime(0,0,0,date("m"), date("d"),
date("Y"));
$user_id = $GLOBALS['phpgw_info']['user']['id'];
@@ -83,7 +94,6 @@
$case->set_check_item_id( $check_item->get_id() );
$case->set_status($case_status);
$case->set_descr($case_descr);
- $case->set_location_id($location_id);
$case->set_user_id($user_id);
$case->set_entry_date($todays_date);
$case->set_modified_date($todays_date);
Modified: trunk/controller/inc/class.uicheck_list.inc.php
===================================================================
--- trunk/controller/inc/class.uicheck_list.inc.php 2012-01-17 13:20:45 UTC
(rev 8597)
+++ trunk/controller/inc/class.uicheck_list.inc.php 2012-01-17 16:50:22 UTC
(rev 8598)
@@ -368,20 +368,24 @@
$check_list =
$this->so_check_list->get_single($check_list_id);
- $location_code = $check_list->get_location_code();
-
// Fetches all control items for check list
$control_items_for_check_list = array();
- $open_type_1_check_items =
$this->so_check_item->get_check_items($check_list_id, null,
"control_item_type_1", "return_object");
+ $control_items =
$this->so_control_item->get_control_items_by_control($check_list->get_control_id());
+ $check_items =
$this->so_check_item->get_check_items($check_list_id, null, null,
"return_object");
- foreach($open_type_1_check_items as $check_item){
- $control_items_for_check_list[] =
$check_item->get_control_item()->toArray();
+ $remove_control_item_ids_array = 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();
+ }
}
-
- $open_type_2_check_items =
$this->so_check_item->get_check_items($check_list_id, "open",
"control_item_type_2", "return_object");
- foreach($open_type_2_check_items as $check_item){
- $control_items_for_check_list[] =
$check_item->get_control_item()->toArray();
+
+ 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();
+ }
}
$data = array
Modified: trunk/controller/inc/class.uicheck_list_for_location.inc.php
===================================================================
--- trunk/controller/inc/class.uicheck_list_for_location.inc.php
2012-01-17 13:20:45 UTC (rev 8597)
+++ trunk/controller/inc/class.uicheck_list_for_location.inc.php
2012-01-17 16:50:22 UTC (rev 8598)
@@ -59,12 +59,12 @@
'index' => true,
'view_locations_for_control' => true,
'add_location_to_control' => true,
-
'add_check_list_for_location' => true,
-
'save_check_list_for_location' => true,
+
'add_check_list' => true,
+
'save_check_list' => true,
'edit_check_list' => true,
'create_case_message' => true,
'view_control_info' => true,
-
'view_cases_for_check_list' => true
+
'view_cases_for_check_list' => true
);
function __construct()
@@ -315,7 +315,7 @@
self::render_template_xsl(array('control_location_tabs', 'common',
'add_location_to_control'), $data);
}
- function add_check_list_for_location(){
+ function add_check_list(){
$location_code = phpgw::get_var('location_code');
$control_id = phpgw::get_var('control_id');
$date = phpgw::get_var('date');
@@ -363,7 +363,7 @@
$GLOBALS['phpgw']->css->add_external_file('controller/templates/base/css/jquery-ui.custom.css');
-
self::render_template_xsl('check_list/add_check_list_for_location', $data);
+
self::render_template_xsl(array('check_list/check_list_tab_menu','check_list/add_check_list'),
$data);
}
function edit_check_list(){
@@ -420,7 +420,7 @@
self::render_template_xsl(array('check_list/check_list_tab_menu',
'check_list/view_cases_for_check_list'), $data);
}
- function save_check_list_for_location(){
+ function save_check_list(){
$location_code = phpgw::get_var('location_code');
$control_id = phpgw::get_var('control_id');
$status = phpgw::get_var('status');
Modified: trunk/controller/inc/class.uicontrol.inc.php
===================================================================
--- trunk/controller/inc/class.uicontrol.inc.php 2012-01-17 13:20:45 UTC
(rev 8597)
+++ trunk/controller/inc/class.uicontrol.inc.php 2012-01-17 16:50:22 UTC
(rev 8598)
@@ -433,7 +433,7 @@
// Fetches control items for control group and
populates groups_with_control_items with groups and chosen control items
foreach ($control_group_ids as $control_group_id)
{
- $group_control_items_array =
$this->so_control_item->get_control_items_as_array($control_group_id);
+ $group_control_items_array =
$this->so_control_item->get_control_items($control_group_id, "return_array");
$control_items_for_group_array = array();
@@ -734,7 +734,7 @@
$value['parameters'] = array();
$value['ajax'][] = false;
- $value['actions'][] =
html_entity_decode(self::link(array('menuaction' =>
'controller.uicheck_list_for_location.add_check_list_for_location',
'location_code' => $value['location_code'])));
+ $value['actions'][] =
html_entity_decode(self::link(array('menuaction' =>
'controller.uicheck_list_for_location.add_check_list', 'location_code' =>
$value['location_code'])));
$value['labels'][] = lang('add_check_list_to_location');
$value['parameters'][] = "control_id";
}
Modified: trunk/controller/inc/component/class.calendar_builder.inc.php
===================================================================
--- trunk/controller/inc/component/class.calendar_builder.inc.php
2012-01-17 13:20:45 UTC (rev 8597)
+++ trunk/controller/inc/component/class.calendar_builder.inc.php
2012-01-17 16:50:22 UTC (rev 8598)
@@ -17,7 +17,7 @@
foreach($control_array as $control){
$calendar_array = $this->init_calendar( $control,
$calendar_array, $num, $period_type );
-
+ print_r($calendar_array);
// Inserts check_list object on deadline month in
twelve_months_array
foreach($control->get_check_lists_array() as
$check_list){
Modified: trunk/controller/templates/base/calendar/view_calendar_month.xsl
===================================================================
--- trunk/controller/templates/base/calendar/view_calendar_month.xsl
2012-01-17 13:20:45 UTC (rev 8597)
+++ trunk/controller/templates/base/calendar/view_calendar_month.xsl
2012-01-17 16:50:22 UTC (rev 8598)
@@ -123,7 +123,7 @@
<div>
<a>
<xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.add_check_list_for_location</xsl:text>
+
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.add_check_list</xsl:text>
<xsl:text>&date=</xsl:text>
<xsl:value-of select="info/date"/>
<xsl:text>&control_id=</xsl:text>
@@ -207,7 +207,18 @@
</xsl:when>
<xsl:when test="status = 'control_not_accomplished'">
<div>
-
<img height="15" src="controller/images/status_icon_red_cross.png" />
+
<a>
+
<xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.add_check_list</xsl:text>
+
<xsl:text>&date=</xsl:text>
+
<xsl:value-of select="info/date"/>
+
<xsl:text>&control_id=</xsl:text>
+
<xsl:value-of select="info/control_id"/>
+
<xsl:text>&location_code=</xsl:text>
+
<xsl:value-of select="$location_code"/>
+
</xsl:attribute>
+
<img height="15"
src="controller/images/status_icon_red_cross.png" />
+
</a>
</div>
</xsl:when>
<xsl:when test="status = 'control_canceled'">
Modified: trunk/controller/templates/base/calendar/view_calendar_year.xsl
===================================================================
--- trunk/controller/templates/base/calendar/view_calendar_year.xsl
2012-01-17 13:20:45 UTC (rev 8597)
+++ trunk/controller/templates/base/calendar/view_calendar_year.xsl
2012-01-17 16:50:22 UTC (rev 8598)
@@ -84,7 +84,7 @@
<div>
<a>
<xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.add_check_list_for_location</xsl:text>
+
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.add_check_list</xsl:text>
<xsl:text>&date=</xsl:text>
<xsl:value-of select="info/date"/>
<xsl:text>&control_id=</xsl:text>
Copied: trunk/controller/templates/base/check_list/add_check_list.xsl (from rev
8522,
trunk/controller/templates/base/check_list/add_check_list_for_location.xsl)
===================================================================
--- trunk/controller/templates/base/check_list/add_check_list.xsl
(rev 0)
+++ trunk/controller/templates/base/check_list/add_check_list.xsl
2012-01-17 16:50:22 UTC (rev 8598)
@@ -0,0 +1,95 @@
+<!-- $Id$ -->
+<xsl:template match="data" xmlns:php="http://php.net/xsl";>
+<xsl:variable name="date_format">d/m-Y</xsl:variable>
+
+
+<script>
+ $(function() {
+ $( "#planned_date" ).datepicker({
+ monthNames:
['Januar','Februar','Mars','April','Mai','Juni','Juli','August','September','Oktober','November','Desember'],
+ dayNamesMin: ['Sø', 'Ma', 'Ti', 'On', 'To', 'Fr', 'Lø'],
+ dateFormat: 'dd/mm-yy'
+ });
+ $( "#completed_date" ).datepicker({
+ monthNames:
['Januar','Februar','Mars','April','Mai','Juni','Juli','August','September','Oktober','November','Desember'],
+ dayNamesMin: ['Sø', 'Ma', 'Ti', 'On', 'To', 'Fr', 'Lø'],
+ dateFormat: 'dd/mm-yy'
+ });
+ });
+</script>
+
+
+<div id="main_content">
+
+ <h1>Registrere sjekkliste for <xsl:value-of
select="location_array/loc1_name"/></h1>
+
+ <xsl:call-template name="check_list_tab_menu">
+ <xsl:with-param name="active_tab">view_details</xsl:with-param>
+ </xsl:call-template>
+
+ <h3 class="box_header">Sjekklistedetaljer</h3>
+ <fieldset class="check_list_details">
+ <form id="frm_add_check_list"
action="index.php?menuaction=controller.uicheck_list_for_location.save_check_list_for_location"
method="post">
+
+ <div id="calendar_dates">
+ <xsl:for-each select="calendar_array">
+ <xsl:variable
name="cal_date"><xsl:value-of select="."/></xsl:variable>
+
+ <span><xsl:value-of
select="php:function('date', $date_format, number( $cal_date ) )"/></span>
+ </xsl:for-each>
+ </div>
+
+ <xsl:variable name="location_code"><xsl:value-of
select="location_array/location_code"/></xsl:variable>
+ <xsl:variable name="control_id"><xsl:value-of
select="control_array/id"/></xsl:variable>
+
+ <input type="hidden" name="control_id"
value="{$control_id}" />
+ <input type="hidden" name="location_code"
value="{$location_code}" />
+
+ <fieldset class="add_check_list">
+ <div>
+ <label>Status</label>
+ <select name="status">
+ <option value="0"
SELECTED="SELECTED">Ikke utført</option>
+ <option value="1"
>Utført</option>
+ </select>
+ </div>
+ <div>
+ <label>Fristdato</label>
+ <input>
+ <xsl:attribute
name="id">deadline_date</xsl:attribute>
+ <xsl:attribute
name="name">deadline_date</xsl:attribute>
+ <xsl:attribute
name="type">text</xsl:attribute>
+ <xsl:attribute name="value"><xsl:value-of
select="php:function('date', $date_format, number(deadline))"/></xsl:attribute>
+ </input>
+ </div>
+ <div>
+ <label>Planlagt dato</label>
+ <input>
+ <xsl:attribute
name="id">planned_date</xsl:attribute>
+ <xsl:attribute
name="name">planned_date</xsl:attribute>
+ <xsl:attribute
name="type">text</xsl:attribute>
+ <xsl:attribute
name="value"></xsl:attribute>
+ </input>
+ </div>
+ <div>
+ <label>Utført dato</label>
+ <input>
+ <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 != ''">
+ <xsl:attribute
name="value"><xsl:value-of select="php:function('date', $date_format,
number(check_list/completed_date))"/></xsl:attribute>
+ </xsl:if>
+ </input>
+ </div>
+ <div><label>Utstyr</label><input
name="equipment_id" /></div>
+ </fieldset>
+ <div class="form-buttons">
+ <xsl:variable name="lang_save"><xsl:value-of
select="php:function('lang', 'save_check_list')" /></xsl:variable>
+ <input style="width: 170px;" class="btn
not_active" type="submit" name="save_control" value="Lagre detaljer" />
+ </div>
+ </form>
+ </fieldset>
+
+ </div>
+</xsl:template>
Property changes on:
trunk/controller/templates/base/check_list/add_check_list.xsl
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Revision Author Id
Deleted:
trunk/controller/templates/base/check_list/add_check_list_for_location.xsl
===================================================================
--- trunk/controller/templates/base/check_list/add_check_list_for_location.xsl
2012-01-17 13:20:45 UTC (rev 8597)
+++ trunk/controller/templates/base/check_list/add_check_list_for_location.xsl
2012-01-17 16:50:22 UTC (rev 8598)
@@ -1,91 +0,0 @@
-<!-- $Id$ -->
-<xsl:template match="data" xmlns:php="http://php.net/xsl";>
-<xsl:variable name="date_format">d/m-Y</xsl:variable>
-
-
-<script>
- $(function() {
- $( "#planned_date" ).datepicker({
- monthNames:
['Januar','Februar','Mars','April','Mai','Juni','Juli','August','September','Oktober','November','Desember'],
- dayNamesMin: ['Sø', 'Ma', 'Ti', 'On', 'To', 'Fr', 'Lø'],
- dateFormat: 'dd/mm-yy'
- });
- $( "#completed_date" ).datepicker({
- monthNames:
['Januar','Februar','Mars','April','Mai','Juni','Juli','August','September','Oktober','November','Desember'],
- dayNamesMin: ['Sø', 'Ma', 'Ti', 'On', 'To', 'Fr', 'Lø'],
- dateFormat: 'dd/mm-yy'
- });
- });
-</script>
-
-
-<div id="main_content">
-
- <h1>Registrere sjekkliste for <xsl:value-of
select="location_array/loc1_name"/></h1>
-
- <div class="tab_menu"><a class="active">Sjekklistedetaljer</a></div>
- <fieldset class="check_list_details">
- <form id="frm_add_check_list"
action="index.php?menuaction=controller.uicheck_list_for_location.save_check_list_for_location"
method="post">
-
- <div id="calendar_dates">
- <xsl:for-each select="calendar_array">
- <xsl:variable
name="cal_date"><xsl:value-of select="."/></xsl:variable>
-
- <span><xsl:value-of
select="php:function('date', $date_format, number( $cal_date ) )"/></span>
- </xsl:for-each>
- </div>
-
- <xsl:variable name="location_code"><xsl:value-of
select="location_array/location_code"/></xsl:variable>
- <xsl:variable name="control_id"><xsl:value-of
select="control_array/id"/></xsl:variable>
-
- <input type="hidden" name="control_id"
value="{$control_id}" />
- <input type="hidden" name="location_code"
value="{$location_code}" />
-
- <fieldset class="add_check_list">
- <div>
- <label>Status</label>
- <select name="status">
- <option value="0"
SELECTED="SELECTED">Ikke utført</option>
- <option value="1"
>Utført</option>
- </select>
- </div>
- <div>
- <label>Fristdato</label>
- <input>
- <xsl:attribute
name="id">deadline_date</xsl:attribute>
- <xsl:attribute
name="name">deadline_date</xsl:attribute>
- <xsl:attribute
name="type">text</xsl:attribute>
- <xsl:attribute name="value"><xsl:value-of
select="php:function('date', $date_format, number(deadline))"/></xsl:attribute>
- </input>
- </div>
- <div>
- <label>Planlagt dato</label>
- <input>
- <xsl:attribute
name="id">planned_date</xsl:attribute>
- <xsl:attribute
name="name">planned_date</xsl:attribute>
- <xsl:attribute
name="type">text</xsl:attribute>
- <xsl:attribute
name="value"></xsl:attribute>
- </input>
- </div>
- <div>
- <label>Utført dato</label>
- <input>
- <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 != ''">
- <xsl:attribute
name="value"><xsl:value-of select="php:function('date', $date_format,
number(check_list/completed_date))"/></xsl:attribute>
- </xsl:if>
- </input>
- </div>
- <div><label>Utstyr</label><input
name="equipment_id" /></div>
- </fieldset>
- <div class="form-buttons">
- <xsl:variable name="lang_save"><xsl:value-of
select="php:function('lang', 'save_check_list')" /></xsl:variable>
- <input style="width: 170px;" class="btn
not_active" type="submit" name="save_control" value="Lagre detaljer" />
- </div>
- </form>
- </fieldset>
-
- </div>
-</xsl:template>
Modified: trunk/controller/templates/base/check_list/register_case.xsl
===================================================================
--- trunk/controller/templates/base/check_list/register_case.xsl
2012-01-17 13:20:45 UTC (rev 8597)
+++ trunk/controller/templates/base/check_list/register_case.xsl
2012-01-17 16:50:22 UTC (rev 8598)
@@ -38,8 +38,7 @@
</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}" />
+
<input type="submit" name="save_control" value="Registrer sak"
class="not_active" />
</div>
</div>
</form>
@@ -71,7 +70,7 @@
</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 sak"
class="not_active" title="{$lang_save}" />
+
<input type="submit" name="save_control" value="Registrer måling"
class="not_active" title="{$lang_save}" />
</div>
</div>
</form>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [8598],
Torstein <=