[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [13436] more on controller
From: |
Sigurd Nes |
Subject: |
[Fmsystem-commits] [13436] more on controller |
Date: |
Mon, 15 Jun 2015 19:27:52 +0000 |
Revision: 13436
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=13436
Author: sigurdne
Date: 2015-06-15 19:27:51 +0000 (Mon, 15 Jun 2015)
Log Message:
-----------
more on controller
Modified Paths:
--------------
trunk/controller/inc/class.uicase.inc.php
trunk/controller/setup/phpgw_no.lang
trunk/controller/templates/base/case/view_case_message.xsl
trunk/controller/templates/base/check_list/fragments/add_check_list_menu.xsl
trunk/controller/templates/base/check_list/fragments/check_list_menu.xsl
Modified: trunk/controller/inc/class.uicase.inc.php
===================================================================
--- trunk/controller/inc/class.uicase.inc.php 2015-06-15 13:00:33 UTC (rev
13435)
+++ trunk/controller/inc/class.uicase.inc.php 2015-06-15 19:27:51 UTC (rev
13436)
@@ -39,32 +39,32 @@
phpgw::import_class('controller.socheck_list');
phpgw::import_class('controller.socheck_item');
phpgw::import_class('controller.socontrol');
- phpgw::import_class('controller.socontrol_group_list');
- phpgw::import_class('controller.socontrol_item_list');
+ phpgw::import_class('controller.socontrol_group_list');
+ phpgw::import_class('controller.socontrol_item_list');
include_class('controller', 'check_item_case', 'inc/model/');
include_class('controller', 'component', 'inc/model/');
- include_class('controller', 'location_finder', 'inc/helper/');
+ include_class('controller', 'location_finder', 'inc/helper/');
class controller_uicase extends phpgwapi_uicommon
{
private $so;
- private $so_control;
+ private $so_control;
private $so_control_item;
private $so_check_item;
private $so_procedure;
private $so_control_group_list;
private $so_control_group;
private $so_control_item_list;
- private $so_check_list;
+ private $so_check_list;
- private $location_finder;
+ private $location_finder;
- private $read;
- private $add;
- private $edit;
- private $delete;
+ private $read;
+ private $add;
+ private $edit;
+ private $delete;
var $public_functions = array
(
@@ -87,21 +87,21 @@
{
parent::__construct();
- $this->so =
CreateObject('controller.socase');
+ $this->so =
CreateObject('controller.socase');
$this->so_control =
CreateObject('controller.socontrol');
$this->so_control_item =
CreateObject('controller.socontrol_item');
$this->so_check_item =
CreateObject('controller.socheck_item');
$this->so_procedure =
CreateObject('controller.soprocedure');
- $this->so_control_group_list =
CreateObject('controller.socontrol_group_list');
+ $this->so_control_group_list =
CreateObject('controller.socontrol_group_list');
$this->so_control_group =
CreateObject('controller.socontrol_group');
- $this->so_control_item_list =
CreateObject('controller.socontrol_item_list');
+ $this->so_control_item_list =
CreateObject('controller.socontrol_item_list');
$this->so_check_list =
CreateObject('controller.socheck_list');
-
- $this->location_finder = new location_finder();
- $this->read =
$GLOBALS['phpgw']->acl->check('.checklist', PHPGW_ACL_READ, 'controller');//1
- $this->add =
$GLOBALS['phpgw']->acl->check('.checklist', PHPGW_ACL_ADD, 'controller');//2
- $this->edit =
$GLOBALS['phpgw']->acl->check('.checklist', PHPGW_ACL_EDIT, 'controller');//4
+ $this->location_finder = new
location_finder();
+
+ $this->read =
$GLOBALS['phpgw']->acl->check('.checklist', PHPGW_ACL_READ, 'controller');//1
+ $this->add =
$GLOBALS['phpgw']->acl->check('.checklist', PHPGW_ACL_ADD, 'controller');//2
+ $this->edit =
$GLOBALS['phpgw']->acl->check('.checklist', PHPGW_ACL_EDIT, 'controller');//4
$this->delete =
$GLOBALS['phpgw']->acl->check('.checklist', PHPGW_ACL_DELETE, 'controller');//8
if(phpgw::get_var('noframework', 'bool'))
{
@@ -137,10 +137,10 @@
$location_name =
execMethod('property.bolocation.get_location_name',
$component_arr['location_code']);
$short_desc = $location_name . '::' .
execMethod('property.soentity.get_short_description', array('location_id' =>
$location_id, 'id' => $component_id));
-
+
$component = new controller_component();
$component->set_location_code(
$component_arr['location_code'] );
- $component->set_xml_short_desc( $short_desc );
+ $component->set_xml_short_desc( $short_desc );
$component_array = $component->toArray();
$type = 'component';
@@ -288,7 +288,7 @@
'control'
=> $control,
'check_list'
=> $check_list,
'buildings_on_property'
=> $buildings_on_property,
- 'location_array'
=> $location_array,
+ 'location_array'
=> $location_array,
'component_array'
=> $component_array,
'control_groups_with_items_array' =>
$control_groups_with_items_array,
'type'
=> $type,
@@ -314,14 +314,14 @@
'control'
=> $case_data['control'],
'check_list'
=> $check_list,
'buildings_on_property'
=> $case_data['buildings_on_property'],
- 'location_array'
=> $case_data['location_array'],
+ 'location_array'
=> $case_data['location_array'],
'component_array'
=> $case_data['component_array'],
'control_groups_with_items_array' =>
$case_data['control_groups_with_items_array'],
'type'
=> $case_data['type'],
'location_level'
=> $level,
'current_year'
=> $year,
'current_month_nr'
=> $month,
- 'cases_view'
=> 'add_case',
+ 'cases_view'
=> 'add_case',
);
phpgwapi_jquery::load_widget('core');
@@ -336,7 +336,7 @@
'check_list/fragments/check_list_top_section', 'case/add_case',
'check_list/fragments/select_buildings_on_property'), $data);
}
-
+
public function get_case_data_ajax()
{
$check_list_id = phpgw::get_var('check_list_id');
@@ -378,7 +378,7 @@
$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 );
-
+
$saved_check_item_id =
$this->so_check_item->store( $new_check_item );
$check_item =
$this->so_check_item->get_single($saved_check_item_id);
}
@@ -428,7 +428,7 @@
return json_encode( array( "status" =>
"not_saved" ) );
}
}
-
+
function save_case()
{
if(!$this->add && !$this->edit)
@@ -523,12 +523,12 @@
$short_desc = $location_name . '::' .
execMethod('property.soentity.get_short_description', array('location_id' =>
$location_id, 'id' => $component_id));
// $short_desc =
execMethod('property.soentity.get_short_description', array('location_id' =>
$location_id, 'id' => $component_id));
-
+
$component = new controller_component();
$component->set_id($component_id);
$component->set_location_id($location_id);
$component->set_location_code(
$component_arr['location_code'] );
- $component->set_xml_short_desc( $short_desc );
+ $component->set_xml_short_desc( $short_desc );
$component_array = $component->toArray();
$building_location_code =
$this->location_finder->get_building_location_code($component_arr['location_code']);
@@ -554,7 +554,7 @@
'check_items_and_cases' =>
$check_items_and_cases,
'location_array' =>
$location_array,
'component_array' =>
$component_array,
- 'building_location_code' =>
$building_location_code,
+ 'building_location_code' =>
$building_location_code,
'current_year' =>
$year,
'current_month_nr' =>
$month,
'type'
=> $type,
@@ -641,7 +641,7 @@
$ticket = array
(
- 'origin_id' => $location_id,
+ 'origin_id' => $location_id,
'origin_item_id' => $check_list_id,
'location_code' => $location_code,
'cat_id' =>
$message_cat_id,
@@ -667,11 +667,11 @@
$interlink_data = array
(
- 'location1_id' =>
$component_location_id,
+ 'location1_id' =>
$component_location_id,
'location1_item_id' => $component_id,
- 'location2_id' =>
$location_id_ticket,
+ 'location2_id' =>
$location_id_ticket,
'location2_item_id' =>
$message_ticket_id,
- 'account_id' => $user_id
+ 'account_id' => $user_id
);
execMethod('property.interlink.add',
$interlink_data);
@@ -728,12 +728,12 @@
$short_desc = $location_name . '::' .
execMethod('property.soentity.get_short_description', array('location_id' =>
$location_id, 'id' => $component_id));
// $short_desc =
execMethod('property.soentity.get_short_description', array('location_id' =>
$location_id, 'id' => $component_id));
-
+
$component = new controller_component();
$component->set_id($component_id);
$component->set_location_id($location_id);
$component->set_location_code(
$component_arr['location_code'] );
- $component->set_xml_short_desc( $short_desc );
+ $component->set_xml_short_desc( $short_desc );
$component_array = $component->toArray();
$type = 'component';
@@ -752,18 +752,18 @@
$data = array
(
- 'control' =>
$control->toArray(),
- 'message_ticket_id' =>
$message_ticket_id,
+ 'control'
=> $control->toArray(),
+ 'message_ticket_id' =>
$message_ticket_id,
'message_ticket' =>
$message_ticket,
- 'category' =>
$category[0]['name'],
+ 'category'
=> $category[0]['name'],
'location_array' =>
$location_array,
- 'component_array' => $component_array,
- 'control_array' =>
$control->toArray(),
- 'check_list' =>
$check_list->toArray(),
- 'check_items_and_cases' =>
$check_items_and_cases,
- 'current_year' => $year,
- 'current_month_nr' => $month,
- 'type' => $type,
+ 'component_array' =>
$component_array,
+ 'control_array' =>
$control->toArray(),
+ 'check_list' =>
$check_list->toArray(),
+ 'check_items_and_cases' =>
$check_items_and_cases,
+ 'current_year' =>
$year,
+ 'current_month_nr' =>
$month,
+ 'type'
=> $type,
'building_location_code' =>
$building_location_code,
'location_level' =>
$level
);
@@ -878,9 +878,9 @@
return json_encode( array( "status" => "false"
) );
}
}
-
- function view_open_cases()
- {
+
+ function view_open_cases()
+ {
$check_list_id = phpgw::get_var('check_list_id');
$case_location_code = phpgw::get_var('location_code');
@@ -888,7 +888,7 @@
$control =
$this->so_control->get_single($check_list->get_control_id());
$check_list_location_code =
$check_list->get_location_code();
-
+
$component_id = $check_list->get_component_id();
if($component_id > 0)
@@ -903,12 +903,12 @@
$short_desc = $location_name . '::' .
execMethod('property.soentity.get_short_description', array('location_id' =>
$location_id, 'id' => $component_id));
// $short_desc =
execMethod('property.soentity.get_short_description', array('location_id' =>
$location_id, 'id' => $component_id));
-
+
$component = new controller_component();
$component->set_id($component_id);
$component->set_location_id($location_id);
$component->set_location_code(
$component_arr['location_code'] );
- $component->set_xml_short_desc( $short_desc );
+ $component->set_xml_short_desc( $short_desc );
$component_array = $component->toArray();
$type = 'component';
@@ -923,8 +923,8 @@
// Fetches locations on property
$buildings_on_property =
$this->location_finder->get_buildings_on_property($user_role,
$check_list_location_code, $level);
}
-
-
+
+
$level =
$this->location_finder->get_location_level($check_list_location_code);
$year = date("Y", $check_list->get_deadline());
$month = date("n", $check_list->get_deadline());
@@ -933,7 +933,7 @@
$open_check_items_and_cases =
$this->so_check_item->get_check_items_with_cases($check_list_id, $_type = null,
'open_or_waiting', null, $case_location_code);
-
+
if( $buildings_on_property )
{
foreach ( $buildings_on_property as &$building)
@@ -941,7 +941,7 @@
$building['selected'] = $building['id']
== $case_location_code ? 1 : 0;
}
}
-
+
foreach($open_check_items_and_cases as $key =>
$check_item)
{
$control_item_with_options =
$this->so_control_item->get_single_with_options(
$check_item->get_control_item_id() );
@@ -957,30 +957,30 @@
}
}
- $check_item->get_control_item()->set_options_array(
$control_item_with_options->get_options_array() );
+
$check_item->get_control_item()->set_options_array(
$control_item_with_options->get_options_array() );
$open_check_items_and_cases[$key] = $check_item;
}
-
+
$data = array
(
- 'control'
=> $control,
+ 'control'
=> $control,
'check_list'
=> $check_list,
- 'buildings_on_property' =>
$buildings_on_property,
- 'location_array' =>
$location_array,
+ 'buildings_on_property' =>
$buildings_on_property,
+ 'location_array'
=> $location_array,
'component_array'
=> $component_array,
'type'
=> $type,
'location_level'
=> $level,
// 'building_location_code' =>
$case_location_code,
'current_year'
=> $year,
'current_month_nr'
=> $month,
- 'open_check_items_and_cases' =>
$open_check_items_and_cases,
- 'cases_view' =>
'open_cases'
+ 'open_check_items_and_cases' =>
$open_check_items_and_cases,
+ 'cases_view'
=> 'open_cases'
);
-
+
phpgwapi_jquery::load_widget('core');
self::add_javascript('controller', 'controller',
'case.js');
self::add_javascript('controller', 'controller',
'check_list_update_status.js');
-
+
self::render_template_xsl(
array('check_list/fragments/check_list_menu', 'case/cases_tab_menu',
'case/view_open_cases', 'case/case_row',
'check_list/fragments/nav_control_plan',
'check_list/fragments/check_list_top_section',
'check_list/fragments/select_buildings_on_property'), $data );
@@ -992,11 +992,11 @@
$case_location_code = phpgw::get_var('location_code');
$check_list =
$this->so_check_list->get_single($check_list_id);
-
- // Check list top section info
+
+ // Check list top section info
$control =
$this->so_control->get_single($check_list->get_control_id());
$location_code = $check_list->get_location_code();
-
+
$component_id = $check_list->get_component_id();
if($component_id > 0)
@@ -1010,12 +1010,12 @@
$short_desc = $location_name . '::' .
execMethod('property.soentity.get_short_description', array('location_id' =>
$location_id, 'id' => $component_id));
// $short_desc =
execMethod('property.soentity.get_short_description', array('location_id' =>
$location_id, 'id' => $component_id));
-
+
$component = new controller_component();
$component->set_id($component_id);
$component->set_location_id($location_id);
$component->set_location_code(
$component_arr['location_code'] );
- $component->set_xml_short_desc( $short_desc );
+ $component->set_xml_short_desc( $short_desc );
$component_array = $component->toArray();
$type = 'component';
@@ -1031,7 +1031,7 @@
$buildings_on_property =
$this->location_finder->get_buildings_on_property($user_role, $location_code,
$level);
}
// Check list top section info
-
+
$level =
$this->location_finder->get_location_level($location_code);
$year = date("Y", $check_list->get_deadline());
$month = date("n", $check_list->get_deadline());
@@ -1067,10 +1067,10 @@
$data = array
(
- 'control'
=> $control,
+ 'control'
=> $control,
'check_list'
=> $check_list,
- 'buildings_on_property' =>
$buildings_on_property,
- 'location_array' =>
$location_array,
+ 'buildings_on_property' =>
$buildings_on_property,
+ 'location_array'
=> $location_array,
'component_array'
=> $component_array,
'type'
=> $type,
'location_level'
=> $level,
@@ -1078,9 +1078,9 @@
'current_year'
=> $year,
'current_month_nr'
=> $month,
'closed_check_items_and_cases' =>
$closed_check_items_and_cases,
- 'check_list' =>
$check_list,
- 'cases_view' =>
'closed_cases',
- 'building_location_code' =>
$building_location_code
+ 'check_list'
=> $check_list,
+ 'cases_view'
=> 'closed_cases',
+ 'building_location_code' =>
$building_location_code
);
phpgwapi_jquery::load_widget('core');
@@ -1088,8 +1088,8 @@
self::add_javascript('controller', 'controller',
'check_list_update_status.js');
self::render_template_xsl(
array('check_list/fragments/check_list_menu', 'case/cases_tab_menu',
'case/view_closed_cases', 'case/case_row',
-
'check_list/fragments/nav_control_plan',
'check_list/fragments/check_list_top_section',
-
'check_list/fragments/select_buildings_on_property'), $data );
+
'check_list/fragments/nav_control_plan',
'check_list/fragments/check_list_top_section',
+
'check_list/fragments/select_buildings_on_property'), $data );
}
public function query(){}
Modified: trunk/controller/setup/phpgw_no.lang
===================================================================
--- trunk/controller/setup/phpgw_no.lang 2015-06-15 13:00:33 UTC (rev
13435)
+++ trunk/controller/setup/phpgw_no.lang 2015-06-15 19:27:51 UTC (rev
13436)
@@ -1,3 +1,5 @@
+add case controller no Registrer sak
+add ticket controller no Registrer melding
add_check_list_to_location controller no Registrer kontroll for
bygg
added controller no Lagt til
deleted controller no Slettet
Modified: trunk/controller/templates/base/case/view_case_message.xsl
===================================================================
--- trunk/controller/templates/base/case/view_case_message.xsl 2015-06-15
13:00:33 UTC (rev 13435)
+++ trunk/controller/templates/base/case/view_case_message.xsl 2015-06-15
19:27:51 UTC (rev 13436)
@@ -1,130 +1,154 @@
<!-- $Id: edit_check_list.xsl 8374 2011-12-20 07:45:04Z vator $ -->
<xsl:template match="data" name="view_check_list"
xmlns:php="http://php.net/xsl">
-<div id="main_content" class="medium">
+ <div id="main_content" class="medium">
- <div id="check-list-heading">
- <div class="box-1">
- <h1>Kontroll: <xsl:value-of
select="control/title"/></h1>
- <xsl:choose>
- <xsl:when test="type = 'component'">
- <h2><xsl:value-of
select="component_array/xml_short_desc"/></h2>
- </xsl:when>
- <xsl:otherwise>
- <xsl:choose>
- <xsl:when test="location_level
= 1">
- <h2>Eiendom:
<xsl:value-of select="location_array/loc1_name"/></h2>
- </xsl:when>
- <xsl:otherwise>
+ <div id="check-list-heading">
+ <div class="box-1">
+ <h1>Kontroll: <xsl:value-of
select="control/title"/></h1>
+ <xsl:choose>
+ <xsl:when test="type = 'component'">
+ <h2>
+ <xsl:value-of
select="component_array/xml_short_desc"/>
+ </h2>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:choose>
+ <xsl:when
test="location_level = 1">
+ <h2>Eiendom:
<xsl:value-of select="location_array/loc1_name"/></h2>
+ </xsl:when>
+ <xsl:otherwise>
<h2>Bygg:
<xsl:value-of select="location_array/loc2_name"/></h2>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:otherwise>
- </xsl:choose>
- </div>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:otherwise>
+ </xsl:choose>
+ </div>
- <div class="box-2 select-box">
- <xsl:when test="type = 'component'">
- <a>
- <xsl:attribute name="href">
- <xsl:value-of
select="php:function('get_phpgw_link', '/index.php',
'menuaction:controller.uicomponent.index' )" />
- <xsl:text>&year=</xsl:text>
- <xsl:value-of
select="current_year"/>
-
<xsl:text>&location_id=</xsl:text>
- <xsl:value-of
select="component_array/location_id"/>
-
<xsl:text>&component_id=</xsl:text>
- <xsl:value-of
select="component_array/id"/>
- </xsl:attribute>
- Kontrollplan for komponent (år)
- </a>
- </xsl:when>
- <xsl:otherwise>
- <a>
- <xsl:attribute name="href">
- <xsl:value-of
select="php:function('get_phpgw_link', '/index.php',
'menuaction:controller.uicalendar.view_calendar_for_year' )" />
- <xsl:text>&year=</xsl:text>
- <xsl:value-of
select="current_year"/>
-
<xsl:text>&location_code=</xsl:text>
- <xsl:value-of
select="location_array/location_code"/>
- </xsl:attribute>
- Vis kontrollplan (år)
- </a>
+ <div class="box-2 select-box">
+ <xsl:choose>
+ <xsl:when test="type = 'component'">
+ <a>
+ <xsl:attribute
name="href">
+ <xsl:value-of
select="php:function('get_phpgw_link', '/index.php',
'menuaction:controller.uicomponent.index' )" />
+
<xsl:text>&year=</xsl:text>
+ <xsl:value-of
select="current_year"/>
+
<xsl:text>&location_id=</xsl:text>
+ <xsl:value-of
select="component_array/location_id"/>
+
<xsl:text>&component_id=</xsl:text>
+ <xsl:value-of
select="component_array/id"/>
+ </xsl:attribute>
+ Kontrollplan for
komponent (år)
+ </a>
+ </xsl:when>
+ <xsl:otherwise>
+ <a>
+ <xsl:attribute
name="href">
+ <xsl:value-of
select="php:function('get_phpgw_link', '/index.php',
'menuaction:controller.uicalendar.view_calendar_for_year' )" />
+
<xsl:text>&year=</xsl:text>
+ <xsl:value-of
select="current_year"/>
+
<xsl:text>&location_code=</xsl:text>
+ <xsl:value-of
select="location_array/location_code"/>
+ </xsl:attribute>
+ Vis kontrollplan (år)
+ </a>
- <a class="last">
- <xsl:attribute name="href">
- <xsl:value-of
select="php:function('get_phpgw_link', '/index.php',
'menuaction:controller.uicalendar.view_calendar_for_month' )" />
- <xsl:text>&year=</xsl:text>
- <xsl:value-of
select="current_year"/>
- <xsl:text>&month=</xsl:text>
- <xsl:value-of
select="current_month_nr"/>
-
<xsl:text>&location_code=</xsl:text>
- <xsl:value-of
select="location_array/location_code"/>
- </xsl:attribute>
- Vis kontrollplan (måned)
- </a>
- </xsl:otherwise>
+ <a class="last">
+ <xsl:attribute
name="href">
+ <xsl:value-of
select="php:function('get_phpgw_link', '/index.php',
'menuaction:controller.uicalendar.view_calendar_for_month' )" />
+
<xsl:text>&year=</xsl:text>
+ <xsl:value-of
select="current_year"/>
+
<xsl:text>&month=</xsl:text>
+ <xsl:value-of
select="current_month_nr"/>
+
<xsl:text>&location_code=</xsl:text>
+ <xsl:value-of
select="location_array/location_code"/>
+ </xsl:attribute>
+ Vis kontrollplan (måned)
+ </a>
+ </xsl:otherwise>
+ </xsl:choose>
+ </div>
+
+ <!-- ================== CHECKLIST TAB MENU
===================== -->
+ <xsl:call-template name="check_list_menu" />
</div>
-
- <!-- ================== CHECKLIST TAB MENU
===================== -->
- <xsl:call-template name="check_list_menu" />
- </div>
- <!-- ======================= INFO ABOUT MESSAGE
========================= -->
- <h3 class="box_header ext">Registrert melding</h3>
- <div id="caseMessage" class="box ext">
+ <!-- ======================= INFO ABOUT MESSAGE
========================= -->
+ <h3 class="box_header ext">Registrert melding</h3>
+ <div id="caseMessage" class="box ext">
- <xsl:variable name="show_ticket_params">
-
<xsl:text>menuaction:property.uitts.view, id:</xsl:text>
- <xsl:value-of
select="message_ticket_id" />
- </xsl:variable>
- <xsl:variable name="show_ticket_url">
- <xsl:value-of
select="php:function('get_phpgw_link', '/index.php', $show_ticket_params )" />
- </xsl:variable>
- <a id="showMessage" target="_blank"
href="{$show_ticket_url}"><xsl:value-of select="php:function('lang', 'Show
message')" /></a>
+ <xsl:variable name="show_ticket_params">
+ <xsl:text>menuaction:property.uitts.view,
id:</xsl:text>
+ <xsl:value-of select="message_ticket_id" />
+ </xsl:variable>
+ <xsl:variable name="show_ticket_url">
+ <xsl:value-of
select="php:function('get_phpgw_link', '/index.php', $show_ticket_params )" />
+ </xsl:variable>
+ <a id="showMessage" target="_blank"
href="{$show_ticket_url}">
+ <xsl:value-of select="php:function('lang',
'Show message')" />
+ </a>
- <!-- === TITLE === -->
- <div class="row">
- <label>Tittel på
melding:</label><span><xsl:value-of select="message_ticket/subject"/></span>
+ <!-- === TITLE === -->
+ <div class="row">
+ <label>Tittel på melding:</label>
+ <span>
+ <xsl:value-of
select="message_ticket/subject"/>
+ </span>
</div>
<!-- === CATEGORY === -->
<div class="row">
- <label>Kategori</label><span><xsl:value-of
select="category"/></span>
+ <label>Kategori</label>
+ <span>
+ <xsl:value-of select="category"/>
+ </span>
</div>
<!-- === UPLOAD FILE === -->
<div class="row">
<label>Filvedlegg:</label>
- <xsl:for-each
select="message_ticket/files">
- <li><xsl:value-of
select="."/></li>
- </xsl:for-each>
+ <xsl:for-each select="message_ticket/files">
+ <li>
+ <xsl:value-of select="."/>
+ </li>
+ </xsl:for-each>
</div>
- <h3>Meldingen inneholder disse sakene</h3>
- <ul class="cases">
- <xsl:for-each select="check_items_and_cases">
- <xsl:choose>
- <xsl:when
test="cases_array/child::node()">
- <li class="check_item">
- <h4><span><xsl:value-of
select="control_item/title"/></span></h4>
- <ul>
- <xsl:for-each
select="cases_array">
-
<xsl:variable name="cases_id"><xsl:value-of select="id"/></xsl:variable>
-
<li><xsl:value-of select="descr"/></li>
- </xsl:for-each>
- </ul>
- </li>
- </xsl:when>
- </xsl:choose>
- </xsl:for-each>
- </ul>
+ <h3>Meldingen inneholder disse sakene</h3>
+ <ul class="cases">
+ <xsl:for-each select="check_items_and_cases">
+ <xsl:choose>
+ <xsl:when
test="cases_array/child::node()">
+ <li class="check_item">
+ <h4>
+ <span>
+
<xsl:value-of select="control_item/title"/>
+ </span>
+ </h4>
+ <ul>
+
<xsl:for-each select="cases_array">
+
<xsl:variable name="cases_id">
+
<xsl:value-of select="id"/>
+
</xsl:variable>
+
<li>
+
<xsl:value-of select="descr"/>
+
</li>
+
</xsl:for-each>
+ </ul>
+ </li>
+ </xsl:when>
+ </xsl:choose>
+ </xsl:for-each>
+ </ul>
- <xsl:variable name="new_ticket_params">
-
<xsl:text>menuaction:controller.uicase.create_case_message,
check_list_id:</xsl:text>
- <xsl:value-of select="check_list/id" />
- </xsl:variable>
- <xsl:variable name="new_ticket_url">
- <xsl:value-of select="php:function('get_phpgw_link',
'/index.php', $new_ticket_params)" />
- </xsl:variable>
- <a class="btn" href="{$new_ticket_url}"><xsl:value-of
select="php:function('lang', 'Register new message')" /></a>
+ <xsl:variable name="new_ticket_params">
+
<xsl:text>menuaction:controller.uicase.create_case_message,
check_list_id:</xsl:text>
+ <xsl:value-of select="check_list/id" />
+ </xsl:variable>
+ <xsl:variable name="new_ticket_url">
+ <xsl:value-of
select="php:function('get_phpgw_link', '/index.php', $new_ticket_params)" />
+ </xsl:variable>
+ <a class="btn" href="{$new_ticket_url}">
+ <xsl:value-of select="php:function('lang',
'Register new message')" />
+ </a>
+ </div>
</div>
-</div>
</xsl:template>
Modified:
trunk/controller/templates/base/check_list/fragments/add_check_list_menu.xsl
===================================================================
---
trunk/controller/templates/base/check_list/fragments/add_check_list_menu.xsl
2015-06-15 13:00:33 UTC (rev 13435)
+++
trunk/controller/templates/base/check_list/fragments/add_check_list_menu.xsl
2015-06-15 19:27:51 UTC (rev 13436)
@@ -21,11 +21,11 @@
<div class="right_btns">
<!-- ================== REGISTER NEW CASE =====================
-->
<span class="btn focus first">
- Registrer sak
+ <xsl:value-of select="php:function('lang', 'add
case')"/>
</span>
<!-- ================== REGISTER NEW MESSAGE
===================== -->
<span class="btn focus">
- Registrer melding
+ <xsl:value-of select="php:function('lang', 'add
ticket')"/>
</span>
</div>
</div>
Modified:
trunk/controller/templates/base/check_list/fragments/check_list_menu.xsl
===================================================================
--- trunk/controller/templates/base/check_list/fragments/check_list_menu.xsl
2015-06-15 13:00:33 UTC (rev 13435)
+++ trunk/controller/templates/base/check_list/fragments/check_list_menu.xsl
2015-06-15 19:27:51 UTC (rev 13436)
@@ -1,81 +1,83 @@
<xsl:template name="check_list_menu" xmlns:php="http://php.net/xsl">
- <xsl:param name="active_tab" />
- <xsl:variable name="session_url">&<xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
+ <xsl:param name="active_tab" />
+ <xsl:variable name="session_url">&
+ <xsl:value-of select="php:function('get_phpgw_session_url')" />
+ </xsl:variable>
- <div id="check_list_menu">
- <div class="left_btns">
- <a class="first">
- <xsl:choose>
- <xsl:when test="$active_tab = 'view_details'">
- <xsl:attribute name="class">first
active</xsl:attribute>
- </xsl:when>
- <xsl:otherwise>
- <xsl:attribute name="class">first</xsl:attribute>
- </xsl:otherwise>
- </xsl:choose>
+ <div id="check_list_menu">
+ <div class="left_btns">
+ <a class="first">
+ <xsl:choose>
+ <xsl:when test="$active_tab =
'view_details'">
+ <xsl:attribute
name="class">first active</xsl:attribute>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:attribute
name="class">first</xsl:attribute>
+ </xsl:otherwise>
+ </xsl:choose>
- <xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicheck_list.edit_check_list</xsl:text>
- <xsl:text>&check_list_id=</xsl:text>
- <xsl:value-of select="check_list/id"/>
- <xsl:value-of select="$session_url"/>
- </xsl:attribute>
- Vis detaljer for sjekkliste
- </a>
- <!-- ================== LOADS CASES FOR CHECKLIST
===================== -->
- <a>
- <xsl:if test="$active_tab = 'view_cases'">
- <xsl:attribute name="class">active</xsl:attribute>
- </xsl:if>
- <xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicase.view_open_cases</xsl:text>
- <xsl:text>&check_list_id=</xsl:text>
- <xsl:value-of select="check_list/id"/>
- <xsl:value-of select="$session_url"/>
- </xsl:attribute>
- Vis saker
- </a>
- <!-- ================== LOADS INFO ABOUT CONTROL
===================== -->
- <a>
- <xsl:choose>
- <xsl:when test="$active_tab = 'view_control_info'">
- <xsl:attribute name="class">last active</xsl:attribute>
- </xsl:when>
- <xsl:otherwise>
- <xsl:attribute name="class">last</xsl:attribute>
- </xsl:otherwise>
- </xsl:choose>
- <xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicheck_list.view_control_info</xsl:text>
- <xsl:text>&check_list_id=</xsl:text>
- <xsl:value-of select="check_list/id"/>
- <xsl:value-of select="$session_url"/>
- </xsl:attribute>
- Vis info om kontroll
- </a>
- </div>
+ <xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicheck_list.edit_check_list</xsl:text>
+ <xsl:text>&check_list_id=</xsl:text>
+ <xsl:value-of select="check_list/id"/>
+ <xsl:value-of select="$session_url"/>
+ </xsl:attribute>
+ Vis detaljer for sjekkliste
+ </a>
+ <!-- ================== LOADS CASES FOR CHECKLIST
===================== -->
+ <a>
+ <xsl:if test="$active_tab = 'view_cases'">
+ <xsl:attribute
name="class">active</xsl:attribute>
+ </xsl:if>
+ <xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicase.view_open_cases</xsl:text>
+ <xsl:text>&check_list_id=</xsl:text>
+ <xsl:value-of select="check_list/id"/>
+ <xsl:value-of select="$session_url"/>
+ </xsl:attribute>
+ Vis saker
+ </a>
+ <!-- ================== LOADS INFO ABOUT CONTROL
===================== -->
+ <a>
+ <xsl:choose>
+ <xsl:when test="$active_tab =
'view_control_info'">
+ <xsl:attribute
name="class">last active</xsl:attribute>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:attribute
name="class">last</xsl:attribute>
+ </xsl:otherwise>
+ </xsl:choose>
+ <xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicheck_list.view_control_info</xsl:text>
+ <xsl:text>&check_list_id=</xsl:text>
+ <xsl:value-of select="check_list/id"/>
+ <xsl:value-of select="$session_url"/>
+ </xsl:attribute>
+ Vis info om kontroll
+ </a>
+ </div>
- <div class="right_btns">
- <!-- ================== REGISTER NEW CASE =====================
-->
- <a class="btn focus first">
- <xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicase.add_case</xsl:text>
- <xsl:text>&check_list_id=</xsl:text>
- <xsl:value-of select="check_list/id"/>
- <xsl:value-of select="$session_url"/>
- </xsl:attribute>
- Registrer sak
- </a>
- <!-- ================== REGISTER NEW MESSAGE
===================== -->
- <a class="btn focus">
- <xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicase.create_case_message</xsl:text>
- <xsl:text>&check_list_id=</xsl:text>
- <xsl:value-of select="check_list/id"/>
- <xsl:value-of select="$session_url"/>
- </xsl:attribute>
- Registrer melding
- </a>
- </div>
- </div>
+ <div class="right_btns">
+ <!-- ================== REGISTER NEW CASE
===================== -->
+ <a class="btn focus first">
+ <xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicase.add_case</xsl:text>
+ <xsl:text>&check_list_id=</xsl:text>
+ <xsl:value-of select="check_list/id"/>
+ <xsl:value-of select="$session_url"/>
+ </xsl:attribute>
+ <xsl:value-of select="php:function('lang', 'add
case')"/>
+ </a>
+ <!-- ================== REGISTER NEW MESSAGE
===================== -->
+ <a class="btn focus">
+ <xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicase.create_case_message</xsl:text>
+ <xsl:text>&check_list_id=</xsl:text>
+ <xsl:value-of select="check_list/id"/>
+ <xsl:value-of select="$session_url"/>
+ </xsl:attribute>
+ <xsl:value-of select="php:function('lang', 'add
ticket')"/>
+ </a>
+ </div>
+ </div>
</xsl:template>
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [13436] more on controller,
Sigurd Nes <=