[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [8505]
|
From: |
Torstein |
|
Subject: |
[Fmsystem-commits] [8505] |
|
Date: |
Fri, 06 Jan 2012 08:29:19 +0000 |
Revision: 8505
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8505
Author: vator
Date: 2012-01-06 08:29:18 +0000 (Fri, 06 Jan 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/controller/inc/class.uicheck_list.inc.php
trunk/controller/inc/class.uicheck_list_for_location.inc.php
trunk/controller/templates/base/check_list/view_control_info.xsl
trunk/controller/templates/base/control_item/view_control_items.xsl
Added Paths:
-----------
trunk/controller/templates/base/check_list/view_control_details.xsl
Removed Paths:
-------------
trunk/controller/templates/base/control/view_control_details.xsl
Modified: trunk/controller/inc/class.uicheck_list.inc.php
===================================================================
--- trunk/controller/inc/class.uicheck_list.inc.php 2012-01-06 08:19:01 UTC
(rev 8504)
+++ trunk/controller/inc/class.uicheck_list.inc.php 2012-01-06 08:29:18 UTC
(rev 8505)
@@ -43,6 +43,7 @@
private $so_control_item;
private $so_check_list;
private $so_check_item;
+ private $so_procedure;
public $public_functions = array
(
@@ -72,6 +73,7 @@
$this->so_control_item =
CreateObject('controller.socontrol_item');
$this->so_check_list =
CreateObject('controller.socheck_list');
$this->so_check_item =
CreateObject('controller.socheck_item');
+ $this->so_procedure =
CreateObject('controller.soprocedure');
$GLOBALS['phpgw_info']['flags']['menu_selection'] =
"controller::check_list";
}
@@ -316,10 +318,33 @@
$control = $this->so_control->get_single($control_id);
+ // Sigurd: START as categories
+ $cats = CreateObject('phpgwapi.categories', -1,
'controller', '.control');
+ $cats->supress_info = true;
+
+ $control_areas =
$cats->formatted_xslt_list(array('format'=>'filter','selected' =>
$control_area_id,'globals' => true,'use_acl' => $this->_category_acl));
+ array_unshift($control_areas['cat_list'],array
('cat_id'=>'','name'=> lang('select value')));
+ $control_areas_array2 = array();
+ foreach($control_areas['cat_list'] as $cat_list)
+ {
+ $control_areas_array2[] = array
+ (
+ 'id' => $cat_list['cat_id'],
+ 'name' => $cat_list['name'],
+ );
+ }
+ // END as categories
+ $control_area_id = $control_areas_array2[1]['id'];
+ $procedures_array =
$this->so_procedure->get_procedures_by_control_area_id($control_area_id);
+ $role_array = $this->so_control->get_roles();
+
$data = array
(
- 'control' => $control->toArray()
+ 'control' => $control->toArray(),
+ 'procedures_array' =>
$procedures_array,
+ 'role_array' =>
$role_array
);
+
$xslttemplate = CreateObject('phpgwapi.xslttemplates');
Modified: trunk/controller/inc/class.uicheck_list_for_location.inc.php
===================================================================
--- trunk/controller/inc/class.uicheck_list_for_location.inc.php
2012-01-06 08:19:01 UTC (rev 8504)
+++ trunk/controller/inc/class.uicheck_list_for_location.inc.php
2012-01-06 08:29:18 UTC (rev 8505)
@@ -429,7 +429,7 @@
$GLOBALS['phpgw']->css->add_external_file('controller/templates/base/css/jquery-ui.custom.css');
- self::render_template_xsl('edit_check_list', $data);
+ self::render_template_xsl('check_list/edit_check_list',
$data);
}
function save_check_list_for_location(){
Copied: trunk/controller/templates/base/check_list/view_control_details.xsl
(from rev 8499,
trunk/controller/templates/base/control/view_control_details.xsl)
===================================================================
--- trunk/controller/templates/base/check_list/view_control_details.xsl
(rev 0)
+++ trunk/controller/templates/base/check_list/view_control_details.xsl
2012-01-06 08:29:18 UTC (rev 8505)
@@ -0,0 +1,149 @@
+<!-- $Id: choose_control_items.xsl 8267 2011-12-11 12:27:18Z sigurdne $ -->
+
+<xsl:template match="view_control_details">
+
+ <fieldset>
+ <dl class="proplist-col">
+ <dt>
+ <label>Kontrollområde</label>
+ </dt>
+ <dd>
+ <xsl:choose>
+ <xsl:when test="editable">
+ <select id="control_area_id"
name="control_area_id">
+ <xsl:apply-templates
select="control_areas_array2/options"/>
+ </select>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of
select="control/control_area_name" />
+ </xsl:otherwise>
+ </xsl:choose>
+ </dd>
+ <dt>
+ <label>Prosedyre</label>
+ </dt>
+ <dd>
+ <xsl:choose>
+ <xsl:when test="editable">
+ <select id="procedure_id" name="procedure_id">
+ <xsl:for-each select="procedures_array">
+ <xsl:choose>
+ <xsl:when test="id !=
$control_procedure_id">
+ <option
value="{id}">
+
<xsl:value-of disable-output-escaping="yes" select="title"/>
+ </option>
+ </xsl:when>
+ <xsl:otherwise>
+ <option
value="{id}" selected="selected">
+
<xsl:value-of disable-output-escaping="yes" select="title"/>
+ </option>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:for-each>
+ </select>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="control/procedure_name" />
+ </xsl:otherwise>
+ </xsl:choose>
+ </dd>
+ <dt>
+ <label for="title">Tittel</label>
+ </dt>
+ <dd>
+ <xsl:choose>
+ <xsl:when test="editable">
+ <input type="text" name="title"
id="title" value="{control/title}" size="80"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="control/title" />
+ </xsl:otherwise>
+ </xsl:choose>
+ </dd>
+ <dt>
+ <label for="start_date">Startdato</label>
+ </dt>
+ <dd>
+ <input>
+ <xsl:attribute name="id">start_date</xsl:attribute>
+ <xsl:attribute name="name">start_date</xsl:attribute>
+ <xsl:attribute name="type">text</xsl:attribute>
+ <xsl:if test="control/start_date != ''">
+ <xsl:attribute name="value"><xsl:value-of
select="php:function('date', $date_format,
number(control/start_date))"/></xsl:attribute>
+ </xsl:if>
+ </input>
+ </dd>
+ <dt>
+ <label for="end_date">Sluttdato</label>
+ </dt>
+ <dd>
+ <input>
+ <xsl:attribute name="id">end_date</xsl:attribute>
+ <xsl:attribute name="name">end_date</xsl:attribute>
+ <xsl:attribute name="type">text</xsl:attribute>
+ <xsl:if test="control/end_date != 0">
+ <xsl:attribute name="value"><xsl:value-of
select="php:function('date', $date_format,
number(control/end_date))"/></xsl:attribute>
+ </xsl:if>
+ </input>
+ </dd>
+ <dt>
+ <label>Frekvenstype</label>
+ </dt>
+ <dd>
+ <select id="repeat_type" name="repeat_type">
+ <option value="0">Ikke angitt</option>
+ <option value="1">Dag</option>
+ <option value="2">Uke</option>
+ <option value="3">Måned</option>
+ <option value="5">År</option>
+ </select>
+ </dd>
+ <dt>
+ <label>Frekvens</label>
+ </dt>
+ <dd>
+ <xsl:choose>
+ <xsl:when test="editable">
+ <input size="2" type="text"
name="repeat_interval" value="{control/repeat_interval}" />
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="control/repeat_interval"
/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </dd>
+ <dt>
+ <label>Rolle</label>
+ </dt>
+ <dd>
+ <xsl:choose>
+ <xsl:when test="editable">
+ <select id="responsibility_id"
name="responsibility_id">
+ <xsl:for-each select="role_array">
+ <option value="{id}">
+ <xsl:value-of
disable-output-escaping="yes" select="name"/>
+ </option>
+ </xsl:for-each>
+ </select>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="control/role_name" />
+ </xsl:otherwise>
+ </xsl:choose>
+ </dd>
+ <dt>
+ <label for="description">Beskrivelse</label>
+ </dt>
+ <dd>
+ <xsl:choose>
+ <xsl:when test="editable">
+ <textarea cols="70" rows="5" name="description"
id="description"><xsl:value-of select="control/description" /></textarea>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="control/description"
disable-output-escaping="yes"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </dd>
+ </dl>
+ </fieldset>
+
+</xsl:template>
Property changes on:
trunk/controller/templates/base/check_list/view_control_details.xsl
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/controller/templates/base/check_list/view_control_info.xsl
===================================================================
--- trunk/controller/templates/base/check_list/view_control_info.xsl
2012-01-06 08:19:01 UTC (rev 8504)
+++ trunk/controller/templates/base/check_list/view_control_info.xsl
2012-01-06 08:29:18 UTC (rev 8505)
@@ -7,49 +7,64 @@
<script>
$(function() {
- $("#view_control_details").click(function(){
- var requestUrl = $(this).attr("href");
+ $(".tab_menu a").click(function(){
+ var thisTabA = $(this);
+ var thisTabMenu = $(this).parent(".tab_menu");
+
+ var showId = $(thisTabA).attr("href");
+ var hideId =
$(thisTabMenu).find("a.active").attr("href");
- $.ajax({
- type: 'POST',
- url: requestUrl,
- success: function(data) {
- $("#tab_content").html(data);
- }
+ $(thisTabMenu).find("a").removeClass("active");
+ $(thisTabA).addClass('active');
+
+ $(hideId).hide();
+ $(hideId).removeClass("active")
+ $(showId).fadeIn('10', function(){
+ $(showId).addClass('active');
+
});
return false;
});
+
+ $(document).ready(function() {
+ var requestUrl =
$("#view_control_details").attr("href");
+ load_tab(requestUrl);
+ });
+
+ $("#view_control_details").click(function(){
+ var requestUrl = $(this).attr("href");
+ load_tab(requestUrl);
+
+ return false;
+ });
+
$("#view_control_items").click(function(){
var requestUrl = $(this).attr("href");
-
- $.ajax({
- type: 'POST',
- url: requestUrl,
- success: function(data) {
- $("#tab_content").html(data);
- }
- });
+ load_tab(requestUrl);
return false;
});
$("#view_procedures").click(function(){
var requestUrl = $(this).attr("href");
-
- $.ajax({
+ load_tab(requestUrl);
+
+ return false;
+ });
+ });
+
+ function load_tab(requestUrl){
+ $.ajax({
type: 'POST',
url: requestUrl,
success: function(data) {
$("#tab_content").html(data);
}
- });
-
- return false;
});
-
- });
+ }
+
</script>
<h1>Sjekkliste for <xsl:value-of
select="location_array/loc1_name"/></h1>
@@ -64,7 +79,7 @@
Vis info om sjekkliste
</a>
- <a id="view_control_details" class="active">
+ <a id="view_control_info" class="active">
<xsl:attribute name="href">
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.view_control_info</xsl:text>
<xsl:text>&check_list_id=</xsl:text>
@@ -101,168 +116,7 @@
</a>
</div>
- <div id="tab_content" class="content_wrp">
+ <div id="tab_content" class="content_wrp"></div>
- <fieldset>
- <dl class="proplist-col">
- <dt>
- <label>Kontrollområde</label>
- </dt>
- <dd>
- <xsl:choose>
- <xsl:when test="editable">
- <select id="control_area_id"
name="control_area_id">
- <xsl:for-each
select="control_areas_array">
- <xsl:choose>
-
<xsl:when test="id != $control_area_id">
-
<option value="{id}">
-
<xsl:value-of disable-output-escaping="yes" select="title"/>
-
</option>
-
</xsl:when>
-
<xsl:otherwise>
-
<option value="{id}" selected="selected">
-
<xsl:value-of disable-output-escaping="yes" select="title"/>
-
</option>
-
</xsl:otherwise>
- </xsl:choose>
- </xsl:for-each>
- </select>
- <select id="control_area_id"
name="control_area_id">
- <xsl:apply-templates
select="control_areas_array2/options"/>
- </select>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of
select="control/control_area_name" />
- </xsl:otherwise>
- </xsl:choose>
- </dd>
- <dt>
- <label>Prosedyre</label>
- </dt>
- <dd>
- <xsl:choose>
- <xsl:when test="editable">
- <select id="procedure_id"
name="procedure_id">
- <xsl:for-each
select="procedures_array">
- <xsl:choose>
-
<xsl:when test="id != $control_procedure_id">
-
<option value="{id}">
-
<xsl:value-of disable-output-escaping="yes" select="title"/>
-
</option>
-
</xsl:when>
-
<xsl:otherwise>
-
<option value="{id}" selected="selected">
-
<xsl:value-of disable-output-escaping="yes" select="title"/>
-
</option>
-
</xsl:otherwise>
- </xsl:choose>
- </xsl:for-each>
- </select>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of
select="control/procedure_name" />
- </xsl:otherwise>
- </xsl:choose>
- </dd>
- <dt>
- <label for="title">Tittel</label>
- </dt>
- <dd>
- <xsl:choose>
- <xsl:when test="editable">
- <input type="text"
name="title" id="title" value="{control/title}" size="80"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of
select="control/title" />
- </xsl:otherwise>
- </xsl:choose>
- </dd>
- <dt>
- <label
for="start_date">Startdato</label>
- </dt>
- <dd>
- <input>
- <xsl:attribute
name="id">start_date</xsl:attribute>
- <xsl:attribute
name="name">start_date</xsl:attribute>
- <xsl:attribute
name="type">text</xsl:attribute>
- <xsl:if test="control/start_date != ''">
- <xsl:attribute
name="value"><xsl:value-of select="php:function('date', $date_format,
number(control/start_date))"/></xsl:attribute>
- </xsl:if>
- </input>
- </dd>
- <dt>
- <label for="end_date">Sluttdato</label>
- </dt>
- <dd>
- <input>
- <xsl:attribute
name="id">end_date</xsl:attribute>
- <xsl:attribute
name="name">end_date</xsl:attribute>
- <xsl:attribute
name="type">text</xsl:attribute>
- <xsl:if test="control/end_date != 0">
- <xsl:attribute
name="value"><xsl:value-of select="php:function('date', $date_format,
number(control/end_date))"/></xsl:attribute>
- </xsl:if>
- </input>
- </dd>
- <dt>
- <label>Frekvenstype</label>
- </dt>
- <dd>
- <select id="repeat_type"
name="repeat_type">
- <option value="0">Ikke
angitt</option>
- <option value="1">Dag</option>
- <option value="2">Uke</option>
- <option value="3">Måned</option>
- <option value="5">År</option>
- </select>
- </dd>
- <dt>
- <label>Frekvens</label>
- </dt>
- <dd>
- <xsl:choose>
- <xsl:when test="editable">
- <input size="2" type="text"
name="repeat_interval" value="{control/repeat_interval}" />
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of
select="control/repeat_interval" />
- </xsl:otherwise>
- </xsl:choose>
- </dd>
- <dt>
- <label>Rolle</label>
- </dt>
- <dd>
- <xsl:choose>
- <xsl:when test="editable">
- <select id="responsibility_id"
name="responsibility_id">
- <xsl:for-each
select="role_array">
- <option
value="{id}">
-
<xsl:value-of disable-output-escaping="yes" select="name"/>
- </option>
- </xsl:for-each>
- </select>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of
select="control/role_name" />
- </xsl:otherwise>
- </xsl:choose>
- </dd>
- <dt>
- <label
for="description">Beskrivelse</label>
- </dt>
- <dd>
- <xsl:choose>
- <xsl:when test="editable">
- <textarea cols="70" rows="5"
name="description" id="description"><xsl:value-of select="control/description"
/></textarea>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of
select="control/description" disable-output-escaping="yes"/>
- </xsl:otherwise>
- </xsl:choose>
- </dd>
- </dl>
- </fieldset>
-
- </div>
</div>
</xsl:template>
Deleted: trunk/controller/templates/base/control/view_control_details.xsl
===================================================================
--- trunk/controller/templates/base/control/view_control_details.xsl
2012-01-06 08:19:01 UTC (rev 8504)
+++ trunk/controller/templates/base/control/view_control_details.xsl
2012-01-06 08:29:18 UTC (rev 8505)
@@ -1,146 +0,0 @@
-<!-- $Id: choose_control_items.xsl 8267 2011-12-11 12:27:18Z sigurdne $ -->
-
-<xsl:template match="view_control_details">
-
- <dl class="proplist-col">
- <dt>
- <label>Kontrollområde</label>
- </dt>
- <dd>
- <xsl:choose>
- <xsl:when test="editable">
- <select id="control_area_id"
name="control_area_id">
- <xsl:apply-templates
select="control_areas_array2/options"/>
- </select>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of
select="control/control_area_name" />
- </xsl:otherwise>
- </xsl:choose>
- </dd>
- <dt>
- <label>Prosedyre</label>
- </dt>
- <dd>
- <xsl:choose>
- <xsl:when test="editable">
- <select id="procedure_id" name="procedure_id">
- <xsl:for-each select="procedures_array">
- <xsl:choose>
- <xsl:when test="id !=
$control_procedure_id">
- <option
value="{id}">
-
<xsl:value-of disable-output-escaping="yes" select="title"/>
- </option>
- </xsl:when>
- <xsl:otherwise>
- <option
value="{id}" selected="selected">
-
<xsl:value-of disable-output-escaping="yes" select="title"/>
- </option>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:for-each>
- </select>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="control/procedure_name" />
- </xsl:otherwise>
- </xsl:choose>
- </dd>
- <dt>
- <label for="title">Tittel</label>
- </dt>
- <dd>
- <xsl:choose>
- <xsl:when test="editable">
- <input type="text" name="title"
id="title" value="{control/title}" size="80"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="control/title" />
- </xsl:otherwise>
- </xsl:choose>
- </dd>
- <dt>
- <label for="start_date">Startdato</label>
- </dt>
- <dd>
- <input>
- <xsl:attribute name="id">start_date</xsl:attribute>
- <xsl:attribute name="name">start_date</xsl:attribute>
- <xsl:attribute name="type">text</xsl:attribute>
- <xsl:if test="control/start_date != ''">
- <xsl:attribute name="value"><xsl:value-of
select="php:function('date', $date_format,
number(control/start_date))"/></xsl:attribute>
- </xsl:if>
- </input>
- </dd>
- <dt>
- <label for="end_date">Sluttdato</label>
- </dt>
- <dd>
- <input>
- <xsl:attribute name="id">end_date</xsl:attribute>
- <xsl:attribute name="name">end_date</xsl:attribute>
- <xsl:attribute name="type">text</xsl:attribute>
- <xsl:if test="control/end_date != 0">
- <xsl:attribute name="value"><xsl:value-of
select="php:function('date', $date_format,
number(control/end_date))"/></xsl:attribute>
- </xsl:if>
- </input>
- </dd>
- <dt>
- <label>Frekvenstype</label>
- </dt>
- <dd>
- <select id="repeat_type" name="repeat_type">
- <option value="0">Ikke angitt</option>
- <option value="1">Dag</option>
- <option value="2">Uke</option>
- <option value="3">Måned</option>
- <option value="5">År</option>
- </select>
- </dd>
- <dt>
- <label>Frekvens</label>
- </dt>
- <dd>
- <xsl:choose>
- <xsl:when test="editable">
- <input size="2" type="text"
name="repeat_interval" value="{control/repeat_interval}" />
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="control/repeat_interval"
/>
- </xsl:otherwise>
- </xsl:choose>
- </dd>
- <dt>
- <label>Rolle</label>
- </dt>
- <dd>
- <xsl:choose>
- <xsl:when test="editable">
- <select id="responsibility_id"
name="responsibility_id">
- <xsl:for-each select="role_array">
- <option value="{id}">
- <xsl:value-of
disable-output-escaping="yes" select="name"/>
- </option>
- </xsl:for-each>
- </select>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="control/role_name" />
- </xsl:otherwise>
- </xsl:choose>
- </dd>
- <dt>
- <label for="description">Beskrivelse</label>
- </dt>
- <dd>
- <xsl:choose>
- <xsl:when test="editable">
- <textarea cols="70" rows="5" name="description"
id="description"><xsl:value-of select="control/description" /></textarea>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="control/description"
disable-output-escaping="yes"/>
- </xsl:otherwise>
- </xsl:choose>
- </dd>
- </dl>
-</xsl:template>
Modified: trunk/controller/templates/base/control_item/view_control_items.xsl
===================================================================
--- trunk/controller/templates/base/control_item/view_control_items.xsl
2012-01-06 08:19:01 UTC (rev 8504)
+++ trunk/controller/templates/base/control_item/view_control_items.xsl
2012-01-06 08:29:18 UTC (rev 8505)
@@ -42,10 +42,6 @@
</li>
</xsl:for-each>
</ul>
- <div>
- <xsl:variable
name="lang_save"><xsl:value-of select="php:function('lang', 'save_order')"
/></xsl:variable>
- <input type="submit" id="save_order"
name="save_order" value="{$lang_save}" title = "{$lang_save}" style="opacity:
0.5;" disabled="disabled"/>
- </div>
</form>
</li>
</xsl:for-each>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [8505],
Torstein <=