[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [8628]
|
From: |
Torstein |
|
Subject: |
[Fmsystem-commits] [8628] |
|
Date: |
Sat, 21 Jan 2012 10:42:06 +0000 |
Revision: 8628
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8628
Author: vator
Date: 2012-01-21 10:42:05 +0000 (Sat, 21 Jan 2012)
Log Message:
-----------
Modified Paths:
--------------
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/templates/base/case/create_case_message.xsl
trunk/controller/templates/base/check_list/edit_check_list.xsl
trunk/controller/templates/base/check_list/register_case.xsl
trunk/controller/templates/base/check_list/view_cases_for_check_list.xsl
trunk/controller/templates/base/check_list/view_control_info.xsl
trunk/controller/templates/base/check_list/view_control_items.xsl
Added Paths:
-----------
trunk/controller/templates/base/view_check_lists_for_location_garbage.xsl
Removed Paths:
-------------
trunk/controller/templates/base/control_check_lists.xsl
trunk/controller/templates/base/view_check_lists_for_location.xsl
Modified: trunk/controller/inc/class.uicalendar.inc.php
===================================================================
--- trunk/controller/inc/class.uicalendar.inc.php 2012-01-21 09:47:00 UTC
(rev 8627)
+++ trunk/controller/inc/class.uicalendar.inc.php 2012-01-21 10:42:05 UTC
(rev 8628)
@@ -336,7 +336,7 @@
$this->redirect(array('menuaction' =>
'controller.uicheck_list.view_check_list', 'check_list_id'=>$check_list_id));
}
-
+ /*
public function save_check_list(){
$control_id = phpgw::get_var('control_id');
$control = $this->so_control->get_single($control_id);
@@ -379,7 +379,7 @@
$this->redirect(array('menuaction' =>
'controller.uicheck_list.view_check_list_for_control',
'control_id'=>$control_id));
}
-
+ */
public function make_check_list_for_control(){
$control_id = phpgw::get_var('control_id');
$control = $this->so_control->get_single($control_id);
Modified: trunk/controller/inc/class.uicase.inc.php
===================================================================
--- trunk/controller/inc/class.uicase.inc.php 2012-01-21 09:47:00 UTC (rev
8627)
+++ trunk/controller/inc/class.uicase.inc.php 2012-01-21 10:42:05 UTC (rev
8628)
@@ -148,8 +148,11 @@
$categories =
$catsObj->formatted_xslt_list(array('select_name' =>
'values[cat_id]','selected' => $this->cat_id, 'use_acl' =>
$this->_category_acl));
+ $location_array =
execMethod('property.bolocation.read_single', array('location_code' =>
$location_code));
+
$data = array
(
+ 'location_array' => $location_array,
'categories' => $categories,
'check_list' =>
$check_list->toArray(),
'control' =>
$control->toArray(),
Modified: trunk/controller/inc/class.uicheck_list.inc.php
===================================================================
--- trunk/controller/inc/class.uicheck_list.inc.php 2012-01-21 09:47:00 UTC
(rev 8627)
+++ trunk/controller/inc/class.uicheck_list.inc.php 2012-01-21 10:42:05 UTC
(rev 8628)
@@ -51,9 +51,9 @@
(
'index' => true,
'view_check_lists_for_control' => true,
- 'save_check_list'
=> true,
+ // 'save_check_list'
=> true,
'view_check_list'
=> true,
- 'edit_check_list'
=> true,
+ // 'edit_check_list'
=> true,
'save_check_items'
=> true,
'save_check_item'
=> true,
'get_check_list_info' =>
true,
@@ -212,6 +212,7 @@
return json_encode( $check_items_with_cases );
}
+ /*
public function edit_check_list()
{
$check_list_id = phpgw::get_var('check_list_id');
@@ -227,7 +228,7 @@
self::render_template_xsl('edit_check_list', $data);
}
-
+ */
public function update_check_list(){
$check_list_id = phpgw::get_var('check_list_id');
$status = (int)phpgw::get_var('status');
@@ -368,7 +369,8 @@
$check_list_id = phpgw::get_var('check_list_id');
$check_list =
$this->so_check_list->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();
@@ -389,10 +391,14 @@
}
}
+ $location_array = execMethod(
'property.bolocation.read_single', array('location_code' =>
$check_list->get_location_code()) );
+
$data = array
(
+ 'control'
=> $control->toArray(),
+ 'check_list'
=> $check_list->toArray(),
+ 'location_array' => $location_array,
'control_items_for_check_list' =>
$control_items_for_check_list,
- 'check_list'
=> $check_list->toArray()
);
self::render_template_xsl(array('check_list/check_list_tab_menu',
'check_list/register_case'), $data);
@@ -570,7 +576,7 @@
else
return json_encode( array( "saveStatus" =>
"not_saved" ) );
}
-
+/*
public function save_check_list(){
$control_id = phpgw::get_var('control_id');
$control = $this->so_control->get_single($control_id);
@@ -580,8 +586,7 @@
$repeat_type = $control->get_repeat_type();
$repeat_interval = $control->get_repeat_interval();
- $status = "FALSE";
- $comment = "Kommentar for sjekkliste";
+
$deadline = $start_date;
// Saving check_list
@@ -613,7 +618,7 @@
$this->redirect(array('menuaction' =>
'controller.uicheck_list.view_check_list_for_control',
'control_id'=>$control_id));
}
-
+*/
public function make_check_list_for_control(){
$control_id = phpgw::get_var('control_id');
$control = $this->so_control->get_single($control_id);
Modified: trunk/controller/inc/class.uicheck_list_for_location.inc.php
===================================================================
--- trunk/controller/inc/class.uicheck_list_for_location.inc.php
2012-01-21 09:47:00 UTC (rev 8627)
+++ trunk/controller/inc/class.uicheck_list_for_location.inc.php
2012-01-21 10:42:05 UTC (rev 8628)
@@ -371,6 +371,7 @@
$check_list_id = phpgw::get_var('check_list_id');
$check_list =
$this->so_check_list->get_single($check_list_id);
+ $control =
$this->so_control->get_single($check_list->get_control_id());
$date_format =
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
$location_code = $check_list->get_location_code();
@@ -379,9 +380,10 @@
$data = array
(
- 'check_list'
=> $check_list->toArray(),
- 'location_array'
=> $location_array,
- 'date_format'
=> $date_format
+ 'control' =>
$control->toArray(),
+ 'check_list' =>
$check_list->toArray(),
+ 'location_array' => $location_array,
+ 'date_format' => $date_format
);
self::add_javascript('controller', 'controller',
'jquery.js');
@@ -398,7 +400,8 @@
$check_list_id = phpgw::get_var('check_list_id');
$check_list =
$this->so_check_list->get_single($check_list_id);
-
+ $control =
$this->so_control->get_single($check_list->get_control_id());
+
$date_format =
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
$location_code = $check_list->get_location_code();
@@ -406,9 +409,10 @@
$data = array
(
- 'check_list'
=> $check_list->toArray(),
- 'location_array'
=> $location_array,
- 'date_format'
=> $date_format
+ 'control' =>
$control->toArray(),
+ 'check_list' =>
$check_list->toArray(),
+ 'location_array' => $location_array,
+ 'date_format' => $date_format
);
self::add_javascript('controller', 'controller',
'jquery.js');
Modified: trunk/controller/templates/base/case/create_case_message.xsl
===================================================================
--- trunk/controller/templates/base/case/create_case_message.xsl
2012-01-21 09:47:00 UTC (rev 8627)
+++ trunk/controller/templates/base/case/create_case_message.xsl
2012-01-21 10:42:05 UTC (rev 8628)
@@ -4,8 +4,9 @@
<div id="main_content">
- <h1>Registrer avviksmelding</h1>
-
+ <h1>Utførelse av kontroll: <xsl:value-of
select="control/title"/></h1>
+ <h2>Sjekkliste for: <xsl:value-of
select="location_array/loc1_name"/></h2>
+
<xsl:call-template name="check_list_tab_menu" />
<h3 class="box_header">Meldingen gjelder</h3>
@@ -13,7 +14,7 @@
<h3 class="first">Tittel på kontroll: <xsl:value-of
select="control/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: <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>
@@ -100,7 +101,7 @@
</form>
</xsl:when>
<xsl:otherwise>
- Ingen registrerte avvik
+ Ingen registrerte saker
</xsl:otherwise>
</xsl:choose>
</fieldset>
Modified: trunk/controller/templates/base/check_list/edit_check_list.xsl
===================================================================
--- trunk/controller/templates/base/check_list/edit_check_list.xsl
2012-01-21 09:47:00 UTC (rev 8627)
+++ trunk/controller/templates/base/check_list/edit_check_list.xsl
2012-01-21 10:42:05 UTC (rev 8628)
@@ -24,9 +24,10 @@
});
</script>
+
+ <h1>Utførelse av kontroll: <xsl:value-of
select="control/title"/></h1>
+ <h2>Sjekkliste for: <xsl:value-of
select="location_array/loc1_name"/></h2>
- <h1>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>
Modified: trunk/controller/templates/base/check_list/register_case.xsl
===================================================================
--- trunk/controller/templates/base/check_list/register_case.xsl
2012-01-21 09:47:00 UTC (rev 8627)
+++ trunk/controller/templates/base/check_list/register_case.xsl
2012-01-21 10:42:05 UTC (rev 8628)
@@ -3,8 +3,10 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
<div id="main_content">
- <h1>Registrer avviksmelding</h1>
+ <h1>Utførelse av kontroll: <xsl:value-of select="control/title"/></h1>
+ <h2>Sjekkliste for: <xsl:value-of
select="location_array/loc1_name"/></h2>
+
<xsl:call-template name="check_list_tab_menu" />
<div id="view_cases">
Modified:
trunk/controller/templates/base/check_list/view_cases_for_check_list.xsl
===================================================================
--- trunk/controller/templates/base/check_list/view_cases_for_check_list.xsl
2012-01-21 09:47:00 UTC (rev 8627)
+++ trunk/controller/templates/base/check_list/view_cases_for_check_list.xsl
2012-01-21 10:42:05 UTC (rev 8628)
@@ -55,7 +55,8 @@
}
</script>
- <h1>Sjekkliste for <xsl:value-of
select="location_array/loc1_name"/></h1>
+ <h1>Utførelse av kontroll: <xsl:value-of
select="control/title"/></h1>
+ <h2>Sjekkliste for: <xsl:value-of
select="location_array/loc1_name"/></h2>
<xsl:call-template name="check_list_tab_menu">
<xsl:with-param
name="active_tab">view_cases</xsl:with-param>
Modified: trunk/controller/templates/base/check_list/view_control_info.xsl
===================================================================
--- trunk/controller/templates/base/check_list/view_control_info.xsl
2012-01-21 09:47:00 UTC (rev 8627)
+++ trunk/controller/templates/base/check_list/view_control_info.xsl
2012-01-21 10:42:05 UTC (rev 8628)
@@ -66,7 +66,8 @@
</script>
- <h1>Sjekkliste for <xsl:value-of
select="location_array/loc1_name"/></h1>
+ <h1>Utførelse av kontroll: <xsl:value-of select="control/title"/></h1>
+ <h2>Sjekkliste for: <xsl:value-of
select="location_array/loc1_name"/></h2>
<xsl:call-template name="check_list_tab_menu">
<xsl:with-param
name="active_tab">view_control_info</xsl:with-param>
Modified: trunk/controller/templates/base/check_list/view_control_items.xsl
===================================================================
--- trunk/controller/templates/base/check_list/view_control_items.xsl
2012-01-21 09:47:00 UTC (rev 8627)
+++ trunk/controller/templates/base/check_list/view_control_items.xsl
2012-01-21 10:42:05 UTC (rev 8628)
@@ -4,14 +4,14 @@
<ul>
<xsl:for-each select="saved_groups_with_items_array">
- <li class="list_item">
- <h3><span class="group_order_nr"><xsl:number/></span>.
<xsl:value-of select="control_group/group_name"/></h3>
+ <li>
+ <h3><xsl:value-of
select="control_group/group_name"/></h3>
<form
action="index.php?menuaction=controller.uicontrol_item.save_item_order"
class="frm_save_order">
<xsl:variable
name="control_group_id"><xsl:value-of select="control_group/id"/></xsl:variable>
<input type="hidden" name="control_group_id"
value="{$control_group_id}" />
- <ul id="list">
+ <ul>
<xsl:for-each select="control_items">
<xsl:variable
name="control_item_id"><xsl:value-of select="id"/></xsl:variable>
<xsl:variable name="order_tag">
@@ -25,7 +25,7 @@
</xsl:choose>:<xsl:value-of select="id"/>
</xsl:variable>
- <li class="list_item">
+ <li>
<span>
<span
class="order_nr"><xsl:number/></span>. <xsl:value-of select="title"/><input
type="hidden" name="order_nr[]" value="{$order_tag}" />
</span>
Deleted: trunk/controller/templates/base/control_check_lists.xsl
===================================================================
--- trunk/controller/templates/base/control_check_lists.xsl 2012-01-21
09:47:00 UTC (rev 8627)
+++ trunk/controller/templates/base/control_check_lists.xsl 2012-01-21
10:42:05 UTC (rev 8628)
@@ -1,36 +0,0 @@
-<!-- $Id$ -->
-<xsl:template match="data" xmlns:php="http://php.net/xsl";>
-
-<xsl:call-template name="yui_booking_i18n"/>
-<div class="identifier-header">
-<h1><xsl:value-of select="php:function('lang', 'Check_lists')" /></h1>
-</div>
-
-<div class="yui-content">
- <div id="view_check_lists">
-
- <ul
class="th"><li>Tittel</li><li>Startdato</li><li>Planlagtdato</li><li>Utførtdato</li></ul>
- <ul class="check_list">
- <xsl:for-each select="check_list_array">
- <li>
- <ul class="row">
- <li>
- <a>
- <xsl:attribute
name="href">
-
<xsl:text>index.php?menuaction=controller.uicheck_list.view_check_lists_for_control</xsl:text>
-
<xsl:text>&control_id=</xsl:text>
-
<xsl:value-of select="id"/>
- </xsl:attribute>
-
<span><xsl:value-of select="title"/></span>
- </a>
- </li>
- <li><xsl:value-of
select="start_date"/></li>
- <li><xsl:value-of
select="end_date"/></li>
- </ul>
- </li>
- </xsl:for-each>
- </ul>
-
- </div>
- </div>
-</xsl:template>
Deleted: trunk/controller/templates/base/view_check_lists_for_location.xsl
===================================================================
--- trunk/controller/templates/base/view_check_lists_for_location.xsl
2012-01-21 09:47:00 UTC (rev 8627)
+++ trunk/controller/templates/base/view_check_lists_for_location.xsl
2012-01-21 10:42:05 UTC (rev 8628)
@@ -1,90 +0,0 @@
-<!-- $Id$ -->
-<xsl:template match="data" name="view_check_lists"
xmlns:php="http://php.net/xsl";>
-<xsl:variable name="date_format">d/m-Y</xsl:variable>
-
-<div id="main_content">
-
- <h1>Kalenderoversikt</h1>
- <fieldset class="check_list_details">
- <div><xsl:value-of
select="location_array/loc1_name"/></div>
- <div>Periode: <xsl:value-of
select="php:function('date', 'd/m-Y', number(from_date))"/> - <xsl:value-of
select="php:function('date', 'd/m-Y', number(to_date))"/></div>
- </fieldset>
-
- <h2>Sjekklister</h2>
-
- <ul class="calendar">
- <li class="heading">
- <div>Id</div><div
class="title">Tittel</div><div class="date">Startdato</div><div
class="date">Sluttdato</div>
- <div class="frequency">Frekvenstype</div><div
class="frequency">Frekvensintervall</div>
-
<div>Jan</div><div>Feb</div><div>Mar</div><div>Apr</div><div>Mai</div><div>Jun</div>
-
<div>Jul</div><div>Aug</div><div>Sep</div><div>Okt</div><div>Nov</div><div>Des</div>
- </li>
- <xsl:choose>
- <xsl:when
test="controls_calendar_array/child::node()">
- <xsl:for-each
select="controls_calendar_array">
- <li>
- <div>
- <xsl:value-of
select="control/id"/>
- </div>
- <div class="title">
- <xsl:value-of
select="control/title"/>
- </div>
- <div class="date">
- <xsl:value-of
select="php:function('date', 'd/m-Y', number(control/start_date))"/>
- </div>
- <div class="date">
- <xsl:choose>
-
<xsl:when test="control/end_date != 0">
-
<xsl:value-of select="php:function('date', 'd/m-Y', number(control/end_date))"/>
-
</xsl:when>
-
<xsl:otherwise>
-
Løpende
-
</xsl:otherwise>
- </xsl:choose>
- </div>
- <div class="frequency">
- <xsl:value-of
select="control/repeat_type"/>
- </div>
- <div class="frequency">
- <xsl:value-of
select="control/repeat_interval"/>
- </div>
- <xsl:for-each
select="calendar_array">
- <div
style="position:relative;">
- <div
id="info_box" style="position:absolute;display:none;">
- </div>
- <xsl:choose>
-
<xsl:when test="id">
-
<xsl:variable name="status"><xsl:value-of
select="status"/></xsl:variable>
-
<xsl:choose>
-
<xsl:when test="status = 1">
-
<img height="15"
src="controller/images/status_icon_light_green.png" />
-
</xsl:when>
-
<xsl:otherwise>
-
<a class="view_check_list">
-
<xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicheck_list.get_check_list_info</xsl:text>
-
<xsl:text>&phpgw_return_as=json</xsl:text>
-
<xsl:text>&check_list_id=</xsl:text>
-
<xsl:value-of select="id"/>
-
</xsl:attribute>
-
<img height="15"
src="controller/images/status_icon_red.png" />
-
</a>
-
</xsl:otherwise>
-
</xsl:choose>
-
</xsl:when>
-
<xsl:otherwise>
-
<img height="15" src="controller/images/status_icon_yellow.png" />
-
</xsl:otherwise>
-
</xsl:choose>
- </div>
- </xsl:for-each>
- </li>
- </xsl:for-each>
- </xsl:when>
- <xsl:otherwise>
- Ingen sjekklister for denne kontrollen
- </xsl:otherwise>
- </xsl:choose>
- </ul>
-</div>
-</xsl:template>
Copied:
trunk/controller/templates/base/view_check_lists_for_location_garbage.xsl (from
rev 8487, trunk/controller/templates/base/view_check_lists_for_location.xsl)
===================================================================
--- trunk/controller/templates/base/view_check_lists_for_location_garbage.xsl
(rev 0)
+++ trunk/controller/templates/base/view_check_lists_for_location_garbage.xsl
2012-01-21 10:42:05 UTC (rev 8628)
@@ -0,0 +1,90 @@
+<!-- $Id$ -->
+<xsl:template match="data" name="view_check_lists"
xmlns:php="http://php.net/xsl";>
+<xsl:variable name="date_format">d/m-Y</xsl:variable>
+
+<div id="main_content">
+
+ <h1>Kalenderoversikt</h1>
+ <fieldset class="check_list_details">
+ <div><xsl:value-of
select="location_array/loc1_name"/></div>
+ <div>Periode: <xsl:value-of
select="php:function('date', 'd/m-Y', number(from_date))"/> - <xsl:value-of
select="php:function('date', 'd/m-Y', number(to_date))"/></div>
+ </fieldset>
+
+ <h2>Sjekklister</h2>
+
+ <ul class="calendar">
+ <li class="heading">
+ <div>Id</div><div
class="title">Tittel</div><div class="date">Startdato</div><div
class="date">Sluttdato</div>
+ <div class="frequency">Frekvenstype</div><div
class="frequency">Frekvensintervall</div>
+
<div>Jan</div><div>Feb</div><div>Mar</div><div>Apr</div><div>Mai</div><div>Jun</div>
+
<div>Jul</div><div>Aug</div><div>Sep</div><div>Okt</div><div>Nov</div><div>Des</div>
+ </li>
+ <xsl:choose>
+ <xsl:when
test="controls_calendar_array/child::node()">
+ <xsl:for-each
select="controls_calendar_array">
+ <li>
+ <div>
+ <xsl:value-of
select="control/id"/>
+ </div>
+ <div class="title">
+ <xsl:value-of
select="control/title"/>
+ </div>
+ <div class="date">
+ <xsl:value-of
select="php:function('date', 'd/m-Y', number(control/start_date))"/>
+ </div>
+ <div class="date">
+ <xsl:choose>
+
<xsl:when test="control/end_date != 0">
+
<xsl:value-of select="php:function('date', 'd/m-Y', number(control/end_date))"/>
+
</xsl:when>
+
<xsl:otherwise>
+
Løpende
+
</xsl:otherwise>
+ </xsl:choose>
+ </div>
+ <div class="frequency">
+ <xsl:value-of
select="control/repeat_type"/>
+ </div>
+ <div class="frequency">
+ <xsl:value-of
select="control/repeat_interval"/>
+ </div>
+ <xsl:for-each
select="calendar_array">
+ <div
style="position:relative;">
+ <div
id="info_box" style="position:absolute;display:none;">
+ </div>
+ <xsl:choose>
+
<xsl:when test="id">
+
<xsl:variable name="status"><xsl:value-of
select="status"/></xsl:variable>
+
<xsl:choose>
+
<xsl:when test="status = 1">
+
<img height="15"
src="controller/images/status_icon_light_green.png" />
+
</xsl:when>
+
<xsl:otherwise>
+
<a class="view_check_list">
+
<xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicheck_list.get_check_list_info</xsl:text>
+
<xsl:text>&phpgw_return_as=json</xsl:text>
+
<xsl:text>&check_list_id=</xsl:text>
+
<xsl:value-of select="id"/>
+
</xsl:attribute>
+
<img height="15"
src="controller/images/status_icon_red.png" />
+
</a>
+
</xsl:otherwise>
+
</xsl:choose>
+
</xsl:when>
+
<xsl:otherwise>
+
<img height="15" src="controller/images/status_icon_yellow.png" />
+
</xsl:otherwise>
+
</xsl:choose>
+ </div>
+ </xsl:for-each>
+ </li>
+ </xsl:for-each>
+ </xsl:when>
+ <xsl:otherwise>
+ Ingen sjekklister for denne kontrollen
+ </xsl:otherwise>
+ </xsl:choose>
+ </ul>
+</div>
+</xsl:template>
Property changes on:
trunk/controller/templates/base/view_check_lists_for_location_garbage.xsl
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Revision Author Id
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [8628],
Torstein <=