|
| From: | Torstein |
| Subject: | [Fmsystem-commits] [8514] |
| Date: | Sat, 07 Jan 2012 13:25:55 +0000 |
Revision: 8514
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8514
Author: vator
Date: 2012-01-07 13:25:54 +0000 (Sat, 07 Jan 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/controller/inc/class.uicalendar.inc.php
trunk/controller/inc/class.uicheck_list.inc.php
trunk/controller/inc/class.uicheck_list_for_location.inc.php
trunk/controller/inc/class.uiprocedure.inc.php
trunk/controller/templates/base/check_list/edit_check_list.xsl
trunk/controller/templates/base/check_list/view_control_info.xsl
trunk/controller/templates/base/css/base.css
Added Paths:
-----------
trunk/controller/templates/base/calendar/
trunk/controller/templates/base/calendar/view_calendar_month.xsl
trunk/controller/templates/base/calendar/view_calendar_year.xsl
trunk/controller/templates/base/check_list/view_errors_for_check_list.xsl
Removed Paths:
-------------
trunk/controller/templates/base/view_calendar_month.xsl
trunk/controller/templates/base/view_calendar_year.xsl
Modified: trunk/controller/inc/class.uicalendar.inc.php
===================================================================
--- trunk/controller/inc/class.uicalendar.inc.php 2012-01-07 10:38:09 UTC
(rev 8513)
+++ trunk/controller/inc/class.uicalendar.inc.php 2012-01-07 13:25:54 UTC
(rev 8514)
@@ -122,7 +122,7 @@
self::add_javascript('controller', 'controller',
'jquery.js');
self::add_javascript('controller', 'controller',
'ajax.js');
- self::render_template_xsl('view_calendar_month', $data);
+
self::render_template_xsl('calendar/view_calendar_month', $data);
}
public function view_calendar_for_year()
@@ -164,7 +164,7 @@
'year' =>
$year
);
- self::render_template_xsl('view_calendar_year', $data);
+
self::render_template_xsl('calendar/view_calendar_year', $data);
self::add_javascript('controller', 'controller',
'jquery.js');
self::add_javascript('controller', 'controller',
'ajax.js');
Modified: trunk/controller/inc/class.uicheck_list.inc.php
===================================================================
--- trunk/controller/inc/class.uicheck_list.inc.php 2012-01-07 10:38:09 UTC
(rev 8513)
+++ trunk/controller/inc/class.uicheck_list.inc.php 2012-01-07 13:25:54 UTC
(rev 8514)
@@ -296,28 +296,7 @@
'check_list'
=> $check_list->toArray()
);
- $xslttemplate = CreateObject('phpgwapi.xslttemplates');
-
- $xslttemplate->add_file(array(PHPGW_SERVER_ROOT .
'/controller/templates/base/check_list/view_control_items'));
-
- $xslttemplate->set_var('phpgw',array('view_control_items' =>
$data));
-
- $xslttemplate->xsl_parse();
- $xslttemplate->xml_parse();
-
- $xml = new DOMDocument;
- $xml->loadXML($xslttemplate->xmldata);
-
- $xsl = new DOMDocument;
- $xsl->loadXML($xslttemplate->xsldata);
-
- // Configure the transformer
- $proc = new XSLTProcessor;
- $proc->importStyleSheet($xsl); // attach the xsl rules
-
- $html = $proc->transformToXML($xml);
-
- echo $html;
+
self::render_template_xsl('check_list/view_control_items',
array('view_control_items' => $data));
}
public function view_control_details(){
@@ -352,29 +331,7 @@
'role_array' =>
$role_array
);
- $xslttemplate = CreateObject('phpgwapi.xslttemplates');
-
- $xslttemplate->add_file(array(PHPGW_SERVER_ROOT .
'/controller/templates/base/check_list/view_control_details'));
-
- $xslttemplate->set_var('phpgw',array('view_control_details' =>
$data));
-
- $xslttemplate->xsl_parse();
- $xslttemplate->xml_parse();
-
- $xml = new DOMDocument;
- $xml->loadXML($xslttemplate->xmldata);
-
- $xsl = new DOMDocument;
- $xsl->loadXML($xslttemplate->xsldata);
-
- // Configure the transformer
- $proc = new XSLTProcessor;
- $proc->importStyleSheet($xsl); // attach the xsl rules
- $proc->registerPHPFunctions();
-
- $html = $proc->transformToXML($xml);
-
- echo $html;
+
self::render_template_xsl('check_list/view_control_details',
array('view_control_details' => $data));
}
public function print_check_list(){
@@ -402,31 +359,9 @@
'check_list'
=> $check_list->toArray()
);
- $xslttemplate = CreateObject('phpgwapi.xslttemplates');
-
- $xslttemplate->add_file(array(PHPGW_SERVER_ROOT .
'/controller/templates/base/check_list/print_check_list'));
-
- $xslttemplate->set_var('phpgw',array('view_control_items' =>
$data));
-
- $xslttemplate->xsl_parse();
- $xslttemplate->xml_parse();
-
- $xml = new DOMDocument;
- $xml->loadXML($xslttemplate->xmldata);
-
- $xsl = new DOMDocument;
- $xsl->loadXML($xslttemplate->xsldata);
-
- // Configure the transformer
- $proc = new XSLTProcessor;
- $proc->importStyleSheet($xsl); // attach the xsl rules
-
- $html = $proc->transformToXML($xml);
-
- echo $html;
+
self::render_template_xsl('check_list/print_check_list',
array('view_control_items' => $data));
}
-
function register_errors(){
$check_list_id = phpgw::get_var('check_list_id');
@@ -476,29 +411,7 @@
'check_list' => $check_list->toArray()
);
- $xslttemplate = CreateObject('phpgwapi.xslttemplates');
-
- $xslttemplate->add_file(array(PHPGW_SERVER_ROOT .
'/controller/templates/base/check_list/register_errors'));
-
- $xslttemplate->set_var('phpgw',array('register_errors' => $data));
-
- $xslttemplate->xsl_parse();
- $xslttemplate->xml_parse();
-
- $xml = new DOMDocument;
- $xml->loadXML($xslttemplate->xmldata);
-
- $xsl = new DOMDocument;
- $xsl->loadXML($xslttemplate->xsldata);
-
- // Configure the transformer
- $proc = new XSLTProcessor;
- $proc->importStyleSheet($xsl); // attach the xsl rules
- $proc->registerPHPFunctions();
-
- $html = $proc->transformToXML($xml);
-
- echo $html;
+ self::render_template_xsl('check_list/register_errors',
array('register_errors' => $data));
}
function view_open_errors(){
@@ -515,29 +428,7 @@
'check_list' =>
$check_list->toArray()
);
- $xslttemplate = CreateObject('phpgwapi.xslttemplates');
-
- $xslttemplate->add_file(array(PHPGW_SERVER_ROOT .
'/controller/templates/base/check_list/view_open_errors'));
-
- $xslttemplate->set_var('phpgw',array('view_open_errors' => $data));
-
- $xslttemplate->xsl_parse();
- $xslttemplate->xml_parse();
-
- $xml = new DOMDocument;
- $xml->loadXML($xslttemplate->xmldata);
-
- $xsl = new DOMDocument;
- $xsl->loadXML($xslttemplate->xsldata);
-
- // Configure the transformer
- $proc = new XSLTProcessor;
- $proc->importStyleSheet($xsl); // attach the xsl rules
- $proc->registerPHPFunctions();
-
- $html = $proc->transformToXML($xml);
-
- echo $html;
+
self::render_template_xsl('check_list/view_open_errors',
array('view_open_errors' => $data));
}
function view_closed_errors(){
@@ -554,29 +445,7 @@
'check_list' => $check_list->toArray()
);
- $xslttemplate = CreateObject('phpgwapi.xslttemplates');
-
- $xslttemplate->add_file(array(PHPGW_SERVER_ROOT .
'/controller/templates/base/check_list/view_closed_errors'));
-
- $xslttemplate->set_var('phpgw',array('view_closed_errors' =>
$data));
-
- $xslttemplate->xsl_parse();
- $xslttemplate->xml_parse();
-
- $xml = new DOMDocument;
- $xml->loadXML($xslttemplate->xmldata);
-
- $xsl = new DOMDocument;
- $xsl->loadXML($xslttemplate->xsldata);
-
- // Configure the transformer
- $proc = new XSLTProcessor;
- $proc->importStyleSheet($xsl); // attach the xsl rules
- $proc->registerPHPFunctions();
-
- $html = $proc->transformToXML($xml);
-
- echo $html;
+
self::render_template_xsl('check_list/view_closed_errors',
array('view_closed_errors' => $data));
}
function view_measurements(){
@@ -593,29 +462,7 @@
'check_list' => $check_list->toArray()
);
- $xslttemplate = CreateObject('phpgwapi.xslttemplates');
-
- $xslttemplate->add_file(array(PHPGW_SERVER_ROOT .
'/controller/templates/base/check_list/view_measurements'));
-
- $xslttemplate->set_var('phpgw',array('view_measurements' =>
$data));
-
- $xslttemplate->xsl_parse();
- $xslttemplate->xml_parse();
-
- $xml = new DOMDocument;
- $xml->loadXML($xslttemplate->xmldata);
-
- $xsl = new DOMDocument;
- $xsl->loadXML($xslttemplate->xsldata);
-
- // Configure the transformer
- $proc = new XSLTProcessor;
- $proc->importStyleSheet($xsl); // attach the xsl rules
- $proc->registerPHPFunctions();
-
- $html = $proc->transformToXML($xml);
-
- echo $html;
+
self::render_template_xsl('check_list/view_measurements',
array('view_measurements' => $data));
}
public function view_check_lists_for_control()
Modified: trunk/controller/inc/class.uicheck_list_for_location.inc.php
===================================================================
--- trunk/controller/inc/class.uicheck_list_for_location.inc.php
2012-01-07 10:38:09 UTC (rev 8513)
+++ trunk/controller/inc/class.uicheck_list_for_location.inc.php
2012-01-07 13:25:54 UTC (rev 8514)
@@ -62,7 +62,8 @@
'save_check_list_for_location' => true,
'edit_check_list_for_location' => true,
'create_error_report_message' => true,
-
'view_control_info' => true
+
'view_control_info' => true,
+
'view_errors_for_check_list' => true
);
function __construct()
@@ -370,6 +371,7 @@
$check_list =
$this->so_check_list->get_single($check_list_id);
$date_format =
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
+ $location_code = $check_list->get_location_code();
$location_array =
execMethod('property.bolocation.read_single', array('location_code' =>
$location_code));
@@ -390,6 +392,33 @@
self::render_template_xsl('check_list/edit_check_list',
$data);
}
+ function view_errors_for_check_list(){
+ $check_list_id = phpgw::get_var('check_list_id');
+
+ $check_list =
$this->so_check_list->get_single($check_list_id);
+
+ $date_format =
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
+ $location_code = $check_list->get_location_code();
+
+ $location_array =
execMethod('property.bolocation.read_single', array('location_code' =>
$location_code));
+
+ $data = array
+ (
+ 'check_list'
=> $check_list->toArray(),
+ 'location_array'
=> $location_array,
+ 'date_format'
=> $date_format
+ );
+
+ self::add_javascript('controller', 'controller',
'jquery.js');
+ self::add_javascript('controller', 'controller',
'jquery-ui.custom.min.js');
+ self::add_javascript('controller', 'controller',
'custom_ui.js');
+ self::add_javascript('controller', 'controller',
'ajax.js');
+
+
$GLOBALS['phpgw']->css->add_external_file('controller/templates/base/css/jquery-ui.custom.css');
+
+
self::render_template_xsl('check_list/view_errors_for_check_list', $data);
+ }
+
function save_check_list_for_location(){
$location_code = phpgw::get_var('location_code');
$control_id = phpgw::get_var('control_id');
Modified: trunk/controller/inc/class.uiprocedure.inc.php
===================================================================
--- trunk/controller/inc/class.uiprocedure.inc.php 2012-01-07 10:38:09 UTC
(rev 8513)
+++ trunk/controller/inc/class.uiprocedure.inc.php 2012-01-07 13:25:54 UTC
(rev 8514)
@@ -505,33 +505,7 @@
'group_procedures_array' =>
$group_procedures_array
);
-
self::render_template_xsl('procedure/view_procedures_for_control',
array('view_procedures_for_control' => $data));
-
- /*
- $xslttemplate = CreateObject('phpgwapi.xslttemplates');
-
- $xslttemplate->add_file(array(PHPGW_SERVER_ROOT .
'/controller/templates/base/procedure/view_procedures_for_control'));
-
- $xslttemplate->set_var('phpgw',array('view_procedures_for_control'
=> $data));
-
- $xslttemplate->xsl_parse();
- $xslttemplate->xml_parse();
-
- $xml = new DOMDocument;
- $xml->loadXML($xslttemplate->xmldata);
-
- $xsl = new DOMDocument;
- $xsl->loadXML($xslttemplate->xsldata);
-
- // Configure the transformer
- $proc = new XSLTProcessor;
- $proc->importStyleSheet($xsl); // attach the xsl rules
-
- $html = $proc->transformToXML($xml);
-
- echo $html;
- */
}
public function print_procedure(){
@@ -544,29 +518,7 @@
'procedure' =>
$procedure->toArray()
);
- $xslttemplate = CreateObject('phpgwapi.xslttemplates');
-
- $xslttemplate->add_file(array(PHPGW_SERVER_ROOT .
'/controller/templates/base/procedure/print_procedure'));
-
- $xslttemplate->set_var('phpgw',array('print_procedure' => $data));
-
- $xslttemplate->xsl_parse();
- $xslttemplate->xml_parse();
-
- $xml = new DOMDocument;
- $xml->loadXML($xslttemplate->xmldata);
-
- $xsl = new DOMDocument;
- $xsl->loadXML($xslttemplate->xsldata);
-
- // Configure the transformer
- $proc = new XSLTProcessor;
- $proc->importStyleSheet($xsl); // attach the xsl rules
- $proc->registerPHPFunctions();
-
- $html = $proc->transformToXML($xml);
-
- echo $html;
+ self::render_template_xsl('procedure/print_procedure',
array('print_procedure' => $data));
}
public function query()
Copied: trunk/controller/templates/base/calendar/view_calendar_month.xsl (from
rev 8489, trunk/controller/templates/base/view_calendar_month.xsl)
===================================================================
--- trunk/controller/templates/base/calendar/view_calendar_month.xsl
(rev 0)
+++ trunk/controller/templates/base/calendar/view_calendar_month.xsl
2012-01-07 13:25:54 UTC (rev 8514)
@@ -0,0 +1,214 @@
+<!-- $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>
+<xsl:variable name="location_code"><xsl:value-of
select="location_array/location_code"/></xsl:variable>
+
+<div id="main_content">
+
+ <div style="float:left;">
+ <h1><xsl:value-of
select="location_array/loc1_name"/></h1>
+ <h3 style="margin:0;font-size:19px;">Kalenderoversikt
for <xsl:value-of select="period"/></h3>
+ </div>
+
+
+ <ul id="icon_color_map">
+ <li><img height="13"
src="controller/images/status_icon_yellow_ring.png" /><span>Kontroll satt
opp</span></li>
+ <li><img height="13"
src="controller/images/status_icon_yellow.png" /><span>Kontroll har planlagt
dato</span></li>
+ <li><img height="13"
src="controller/images/status_icon_dark_green.png" /><span>Kontroll gjennomført
uten feil før frist</span></li>
+ <li><img height="13"
src="controller/images/status_icon_light_green.png" /><span>Kontroll
gjennomført uten feil etter frist</span></li>
+ <li><img height="13"
src="controller/images/status_icon_red_empty.png" /><span>Kontroll gjennomført
med rapporterte feil</span></li>
+ <li><img height="11"
src="controller/images/status_icon_red_cross.png" /><span>Kontroll ikke
gjennomført</span></li>
+ </ul>
+
+ <div style="float: left;margin-bottom: 10px;margin-left:
735px;margin-top: 30px;"><a class="move_cal_right" href="#"><img
src="controller/images/arrow_left.png" width="16"/></a></div>
+ <div style="float:left;margin-top: 30px;margin-left: 374px;"><a
class="move_cal_left" href="#"><img src="controller/images/arrow_right.png"
width="16"/></a></div>
+
+ <script>
+ $(document).ready(function() {
+ $(".move_cal_left").click(function(){
+ var leftStrVal =
$("#days_view").css("left");
+ var leftNumVal =
leftStrVal.substring(0, leftStrVal.indexOf('px'));
+
+ if(leftNumVal == -417){
+ $("#days_view").animate({
+ left: '-=93'
+ }, 800);
+ }else if(leftNumVal > -417){
+ $("#days_view").animate({
+ left: '-=417'
+ }, 800);
+ }
+ });
+
+ $(".move_cal_right").click(function(){
+ var leftStrVal =
$("#days_view").css("left");
+ var leftNumVal =
leftStrVal.substring(0, leftStrVal.indexOf('px'));
+
+ if( leftNumVal != 0 ){
+ if(leftNumVal == -93){
+
$("#days_view").animate({
+ left: '+=93'
+ }, 800);
+ }else if( leftNumVal >= -510 ){
+
$("#days_view").animate({
+ left: '+=417'
+ }, 800);
+ }
+ }
+ });
+ });
+ </script>
+
+ <xsl:choose>
+ <xsl:when test="controls_calendar_array/child::node()">
+ <ul style="clear:left;" class="calendar info month">
+ <li class="heading">
+ <div class="id">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>
+ </li>
+
+ <xsl:for-each select="controls_calendar_array">
+ <li>
+ <div class="id">
+ <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', $date_format, number(control/start_date))"/>
+ </div>
+ <div class="date">
+ <xsl:choose>
+ <xsl:when
test="control/end_date != 0">
+ <xsl:value-of
select="php:function('date', $date_format, 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>
+ </li>
+ </xsl:for-each>
+ </ul>
+
+ <div id="days_wrp">
+ <ul id="days_view" class="calendar days">
+ <li class="heading">
+ <xsl:for-each
select="heading_array">
+ <div><xsl:value-of
select="."/></div>
+ </xsl:for-each>
+ </li>
+
+ <xsl:for-each
select="controls_calendar_array">
+ <li>
+ <xsl:for-each
select="calendar_array">
+ <xsl:choose>
+
<xsl:when test="status = 'control_registered'">
+
<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>&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_yellow_ring.png" />
+
</a>
+
</div>
+
</xsl:when>
+
<xsl:when test="status = 'control_planned'">
+
<div>
+
<a>
+
<xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.edit_check_list_for_location</xsl:text>
+
<xsl:text>&check_list_id=</xsl:text>
+
<xsl:value-of select="info/check_list_id"/>
+
</xsl:attribute>
+
<img height="15" src="controller/images/status_icon_yellow.png" />
+
</a>
+
</div>
+
</xsl:when>
+
<xsl:when test="status = 'control_accomplished_in_time_without_errors'">
+
<div>
+
<a>
+
<xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.edit_check_list_for_location</xsl:text>
+
<xsl:text>&check_list_id=</xsl:text>
+
<xsl:value-of select="info/check_list_id"/>
+
</xsl:attribute>
+
<span style="display:none"><xsl:value-of
select="info/id"/></span>
+
<img height="15"
src="controller/images/status_icon_dark_green.png" />
+
</a>
+
</div>
+
</xsl:when>
+
<xsl:when test="status = 'control_accomplished_over_time_without_errors'">
+
<div style="position:relative;">
+
<div id="info_box" style="position:absolute;display:none;"></div>
+
<a>
+
<xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.edit_check_list_for_location</xsl:text>
+
<xsl:text>&check_list_id=</xsl:text>
+
<xsl:value-of select="info/check_list_id"/>
+
</xsl:attribute>
+
<span style="display:none"><xsl:value-of
select="info/id"/></span>
+
<img height="15"
src="controller/images/status_icon_light_green.png" />
+
</a>
+
</div>
+
</xsl:when>
+
<xsl:when test="status = 'control_accomplished_with_errors'">
+
<div style="position:relative;">
+
<div id="info_box" style="position:absolute;display:none;"></div>
+
<a class="view_check_list">
+
<xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.edit_check_list_for_location</xsl:text>
+
<xsl:text>&check_list_id=</xsl:text>
+
<xsl:value-of select="info/check_list_id"/>
+
</xsl:attribute>
+
<span style="display:none">
+
<xsl:text>&check_list_id=</xsl:text><xsl:value-of
select="info/check_list_id"/>
+
<xsl:text>&phpgw_return_as=json</xsl:text>
+
</span>
+
<img height="15"
src="controller/images/status_icon_red_empty.png" />
+
</a>
+
</div>
+
</xsl:when>
+
<xsl:when test="status = 'control_canceled'">
+
<div>
+
<img height="12" src="controller/images/status_icon_red_cross.png" />
+
</div>
+
</xsl:when>
+
<xsl:when test="status = 'control_not_accomplished'">
+
<div>
+
<img height="12" src="controller/images/status_icon_red_cross.png" />
+
</div>
+
</xsl:when>
+
<xsl:otherwise>
+
<div></div>
+
</xsl:otherwise>
+ </xsl:choose>
+ </xsl:for-each>
+ </li>
+ </xsl:for-each>
+ </ul>
+ </div>
+ </xsl:when>
+ <xsl:otherwise>
+ <div>Ingen sjekklister for bygg i angitt periode</div>
+ </xsl:otherwise>
+ </xsl:choose>
+</div>
+</xsl:template>
Property changes on:
trunk/controller/templates/base/calendar/view_calendar_month.xsl
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Revision Author Id
Copied: trunk/controller/templates/base/calendar/view_calendar_year.xsl (from
rev 8489, trunk/controller/templates/base/view_calendar_year.xsl)
===================================================================
--- trunk/controller/templates/base/calendar/view_calendar_year.xsl
(rev 0)
+++ trunk/controller/templates/base/calendar/view_calendar_year.xsl
2012-01-07 13:25:54 UTC (rev 8514)
@@ -0,0 +1,194 @@
+<!-- $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>
+<xsl:variable name="year"><xsl:value-of select="year"/></xsl:variable>
+<xsl:variable name="location_code"><xsl:value-of
select="location_array/location_code"/></xsl:variable>
+
+<div id="main_content">
+
+ <div style="float:left;">
+ <h1><xsl:value-of
select="location_array/loc1_name"/></h1>
+ <h3 style="margin:0;font-size:19px;">Kalenderoversikt
for <xsl:value-of select="period"/></h3>
+ </div>
+
+ <ul id="icon_color_map">
+ <li><img height="13"
src="controller/images/status_icon_yellow_ring.png" /><span>Kontroll satt
opp</span></li>
+ <li><img height="13"
src="controller/images/status_icon_yellow.png" /><span>Kontroll har planlagt
dato</span></li>
+ <li><img height="13"
src="controller/images/status_icon_dark_green.png" /><span>Kontroll gjennomført
uten feil før frist</span></li>
+ <li><img height="13"
src="controller/images/status_icon_light_green.png" /><span>Kontroll
gjennomført uten feil etter frist</span></li>
+ <li><img height="13"
src="controller/images/status_icon_red_empty.png" /><span>Kontroll gjennomført
med rapporterte feil</span></li>
+ <li><img height="11"
src="controller/images/status_icon_red_cross.png" /><span>Kontroll ikke
gjennomført</span></li>
+ </ul>
+
+ <ul class="calendar">
+ <xsl:choose>
+ <xsl:when
test="controls_calendar_array/child::node()">
+
+ <li class="heading">
+ <div class="id">ID</div>
+ <div class="title">Tittel</div>
+ <div class="date">Start dato</div>
+ <div class="date">Slutt dato</div>
+ <div
class="frequency">Frekvenstype</div>
+ <div
class="frequency">Frekvensintervall</div>
+ <div class="months">
+ <xsl:for-each select="heading_array">
+ <div>
+ <a>
+ <xsl:attribute
name="href">
+
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_month</xsl:text>
+
<xsl:text>&year=</xsl:text>
+
<xsl:value-of select="$year"/>
+
<xsl:text>&month=</xsl:text>
+
<xsl:number/>
+ </xsl:attribute>
+ <xsl:value-of
select="."/>
+ </a>
+ </div>
+ </xsl:for-each>
+ </div>
+ </li>
+
+ <xsl:for-each select="controls_calendar_array">
+ <xsl:variable
name="control_id"><xsl:value-of select="control/id"/></xsl:variable>
+ <li>
+ <div class="id">
+ <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', $date_format, number(control/start_date))"/>
+ </div>
+ <div class="date">
+ <xsl:choose>
+ <xsl:when
test="control/end_date != 0">
+ <xsl:value-of
select="php:function('date', $date_format, 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>
+ <div class="months">
+ <xsl:for-each
select="calendar_array">
+ <xsl:choose>
+
<xsl:when test="status = 'control_registered'">
+
<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>&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_yellow_ring.png" />
+
</a>
+
</div>
+
</xsl:when>
+
<xsl:when test="status = 'control_planned'">
+
<div>
+
<a>
+
<xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.edit_check_list_for_location</xsl:text>
+
<xsl:text>&check_list_id=</xsl:text>
+
<xsl:value-of select="info/check_list_id"/>
+
</xsl:attribute>
+
<img height="15" src="controller/images/status_icon_yellow.png" />
+
</a>
+
</div>
+
</xsl:when>
+
<xsl:when test="status = 'control_accomplished_in_time_without_errors'">
+
<div>
+
<a>
+
<xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.edit_check_list_for_location</xsl:text>
+
<xsl:text>&check_list_id=</xsl:text>
+
<xsl:value-of select="info/check_list_id"/>
+
</xsl:attribute>
+
<span style="display:none"><xsl:value-of
select="info/id"/></span>
+
<img height="15"
src="controller/images/status_icon_dark_green.png" />
+
</a>
+
</div>
+
</xsl:when>
+
<xsl:when test="status = 'control_accomplished_over_time_without_errors'">
+
<div style="position:relative;">
+
<div id="info_box" style="position:absolute;display:none;"></div>
+
<a>
+
<xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.edit_check_list_for_location</xsl:text>
+
<xsl:text>&check_list_id=</xsl:text>
+
<xsl:value-of select="info/check_list_id"/>
+
</xsl:attribute>
+
<span style="display:none"><xsl:value-of
select="info/id"/></span>
+
<img height="15"
src="controller/images/status_icon_light_green.png" />
+
</a>
+
</div>
+
</xsl:when>
+
<xsl:when test="status = 'control_accomplished_with_errors'">
+
<div style="position:relative;">
+
<div id="info_box" style="position:absolute;display:none;"></div>
+
<a class="view_check_list">
+
<xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.edit_check_list_for_location</xsl:text>
+
<xsl:text>&check_list_id=</xsl:text>
+
<xsl:value-of select="info/check_list_id"/>
+
</xsl:attribute>
+
<span style="display:none">
+
<xsl:text>&check_list_id=</xsl:text><xsl:value-of
select="info/check_list_id"/>
+
<xsl:text>&phpgw_return_as=json</xsl:text>
+
</span>
+
<img height="15" src="controller/images/status_icon_red.png" />
+
</a>
+
</div>
+
</xsl:when>
+
<xsl:when test="status = 'control_agg_accomplished_with_errors'">
+
<div style="background: url(controller/images/status_icon_red_empty.png)
no-repeat 50% 50%;">
+
<a style="color:#fff;font-weight:bold;text-decoration: none;font-size:10px;"
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="info/id"/>
+
</xsl:attribute>
+
<span><xsl:value-of select="info"/></span>
+
</a>
+
</div>
+
</xsl:when>
+
<xsl:when test="status = 'control_canceled'">
+
<div>
+
<img height="12" src="controller/images/status_icon_red_cross.png" />
+
</div>
+
</xsl:when>
+
<xsl:when test="status = 'control_not_accomplished'">
+
<div>
+
<img height="12" src="controller/images/status_icon_red_cross.png" />
+
</div>
+
</xsl:when>
+
<xsl:otherwise>
+
<div></div>
+
</xsl:otherwise>
+ </xsl:choose>
+
+ </xsl:for-each>
+ </div>
+ </li>
+ </xsl:for-each>
+ </xsl:when>
+ <xsl:otherwise>
+ <div>Ingen sjekklister for bygg i angitt
periode</div>
+ </xsl:otherwise>
+ </xsl:choose>
+ </ul>
+</div>
+</xsl:template>
Property changes on:
trunk/controller/templates/base/calendar/view_calendar_year.xsl
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Revision Author Id
Modified: trunk/controller/templates/base/check_list/edit_check_list.xsl
===================================================================
--- trunk/controller/templates/base/check_list/edit_check_list.xsl
2012-01-07 10:38:09 UTC (rev 8513)
+++ trunk/controller/templates/base/check_list/edit_check_list.xsl
2012-01-07 13:25:54 UTC (rev 8514)
@@ -5,12 +5,6 @@
<div id="main_content">
<script>
-
- $(document).ready(function() {
- var requestUrl =
$("#view_open_errors").attr("href");
- load_tab(requestUrl);
- });
-
$(function() {
$( "#planned_date" ).datepicker({
monthNames:
['Januar','Februar','Mars','April','Mai','Juni','Juli','August','September','Oktober','November','Desember'],
@@ -28,61 +22,47 @@
dateFormat: 'dd/mm-yy'
});
- $("#register_errors").live("click", function(){
- var requestUrl = $(this).attr("href");
- load_tab(requestUrl);
-
- return false;
- });
-
- $("#view_open_errors").live("click", function(){
- var requestUrl = $(this).attr("href");
- load_tab(requestUrl);
-
- return false;
- });
-
- $("#view_closed_errors").live("click", function(){
- var requestUrl = $(this).attr("href");
- load_tab(requestUrl);
-
- return false;
- });
-
- $("#view_measurements").live("click", function(){
- var requestUrl = $(this).attr("href");
- load_tab(requestUrl);
-
- return false;
- });
});
-
- function load_tab(requestUrl){
- $.ajax({
- type: 'POST',
- url: requestUrl,
- success: function(data) {
- $("#load_view_content").html(data);
- }
- });
- }
</script>
<h1>Sjekkliste for <xsl:value-of
select="location_array/loc1_name"/></h1>
<div id="edit_check_list_menu" class="hor_menu">
- <a class="active" id="view_check_list"
href="#view_check_list">Vis info om sjekkliste</a>
- <a id="view_control_details">
+ <a class="active">
<xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.edit_check_list_for_location</xsl:text>
+ <xsl:text>&check_list_id=</xsl:text>
+ <xsl:value-of select="check_list/id"/>
+ </xsl:attribute>
+ Vis detaljer for sjekkliste
+ </a>
+ <a>
+ <xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.view_errors_for_check_list</xsl:text>
+ <xsl:text>&check_list_id=</xsl:text>
+ <xsl:value-of select="check_list/id"/>
+ </xsl:attribute>
+ Vis avvik/saker for sjekkliste
+ </a>
+ <a>
+ <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>
<xsl:value-of select="check_list/id"/>
</xsl:attribute>
Vis info om kontroll
</a>
+
+ <a style="background:#DD624B;border-bottom: 1px solid
#CB563F;border-top: 1px solid #EE836F;box-shadow: 0 1px 0 #A9422E, 0 -1px 0
#A9422E;color: #FFFFFF;height: 18px;margin-left: 40px;margin-top: 1px;">
+ <xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.register_error</xsl:text>
+ <xsl:text>&check_list_id=</xsl:text>
+ <xsl:value-of select="check_list/id"/>
+ </xsl:attribute>
+ Registrer avvik/sak
+ </a>
</div>
-
<div class="tab_menu"><a
class="active">Sjekklistedetaljer</a></div>
<fieldset class="check_list_details">
Modified: trunk/controller/templates/base/check_list/view_control_info.xsl
===================================================================
--- trunk/controller/templates/base/check_list/view_control_info.xsl
2012-01-07 10:38:09 UTC (rev 8513)
+++ trunk/controller/templates/base/check_list/view_control_info.xsl
2012-01-07 13:25:54 UTC (rev 8514)
@@ -5,6 +5,11 @@
<div id="main_content">
<script>
+ $(document).ready(function() {
+ var requestUrl =
$("#view_control_details").attr("href");
+ load_tab(requestUrl);
+ });
+
$(function() {
$(".tab_menu a").click(function(){
@@ -27,12 +32,6 @@
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);
@@ -70,24 +69,40 @@
<h1>Sjekkliste for <xsl:value-of
select="location_array/loc1_name"/></h1>
<div id="edit_check_list_menu" class="hor_menu">
- <a id="view_check_list">
- <xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.edit_check_list_for_location</xsl:text>
- <xsl:text>&check_list_id=</xsl:text>
- <xsl:value-of select="check_list/id"/>
- </xsl:attribute>
- Vis info om sjekkliste
- </a>
-
- <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>
- <xsl:value-of select="check_list/id"/>
- </xsl:attribute>
- Vis info om kontroll
- </a>
- </div>
+ <a>
+ <xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.edit_check_list_for_location</xsl:text>
+ <xsl:text>&check_list_id=</xsl:text>
+ <xsl:value-of select="check_list/id"/>
+ </xsl:attribute>
+ Vis detaljer for sjekkliste
+ </a>
+ <a>
+ <xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.view_errors_for_check_list</xsl:text>
+ <xsl:text>&check_list_id=</xsl:text>
+ <xsl:value-of select="check_list/id"/>
+ </xsl:attribute>
+ Vis avvik/saker for sjekkliste
+ </a>
+ <a 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>
+ <xsl:value-of select="check_list/id"/>
+ </xsl:attribute>
+ Vis info om kontroll
+ </a>
+
+ <a style="background:#DD624B;border-bottom: 1px solid
#CB563F;border-top: 1px solid #EE836F;box-shadow: 0 1px 0 #A9422E, 0 -1px 0
#A9422E;color: #FFFFFF;height: 18px;margin-left: 40px;margin-top: 1px;">
+ <xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.register_error</xsl:text>
+ <xsl:text>&check_list_id=</xsl:text>
+ <xsl:value-of select="check_list/id"/>
+ </xsl:attribute>
+ Registrer avvik/sak
+ </a>
+ </div>
<div class="tab_menu">
<a id="view_control_details" class="active">
@@ -95,6 +110,7 @@
<xsl:text>index.php?menuaction=controller.uicheck_list.view_control_details</xsl:text>
<xsl:text>&control_id=</xsl:text>
<xsl:value-of select="control/id"/>
+
<xsl:text>&phpgw_return_as=stripped_html</xsl:text>
</xsl:attribute>
Kontrolldetaljer
</a>
@@ -103,6 +119,7 @@
<xsl:text>index.php?menuaction=controller.uicheck_list.view_control_items</xsl:text>
<xsl:text>&check_list_id=</xsl:text>
<xsl:value-of select="check_list/id"/>
+
<xsl:text>&phpgw_return_as=stripped_html</xsl:text>
</xsl:attribute>
Kontrollpunkter
</a>
Added: trunk/controller/templates/base/check_list/view_errors_for_check_list.xsl
===================================================================
--- trunk/controller/templates/base/check_list/view_errors_for_check_list.xsl
(rev 0)
+++ trunk/controller/templates/base/check_list/view_errors_for_check_list.xsl
2012-01-07 13:25:54 UTC (rev 8514)
@@ -0,0 +1,106 @@
+<!-- $Id: edit_check_list.xsl 8513 2012-01-07 10:38:09Z vator $ -->
+<xsl:template match="data" name="view_check_list"
xmlns:php="http://php.net/xsl";>
+<xsl:variable name="date_format">d/m-Y</xsl:variable>
+
+<div id="main_content">
+
+ <script>
+
+ $(document).ready(function() {
+ var requestUrl =
$("#view_open_errors").attr("href");
+ load_tab(requestUrl);
+ });
+
+ $(function() {
+
+ $("#register_errors").live("click", function(){
+ var requestUrl = $(this).attr("href");
+ load_tab(requestUrl);
+
+ return false;
+ });
+
+ $("#view_open_errors").live("click", function(){
+ var requestUrl = $(this).attr("href");
+ load_tab(requestUrl);
+
+ return false;
+ });
+
+ $("#view_closed_errors").live("click", function(){
+ var requestUrl = $(this).attr("href");
+ load_tab(requestUrl);
+
+ return false;
+ });
+
+ $("#view_measurements").live("click", function(){
+ var requestUrl = $(this).attr("href");
+ load_tab(requestUrl);
+
+ return false;
+ });
+ });
+
+ function load_tab(requestUrl){
+ $.ajax({
+ type: 'POST',
+ url: requestUrl,
+ success: function(data) {
+ $("#load_view_content").html(data);
+ }
+ });
+ }
+ </script>
+
+ <h1>Sjekkliste for <xsl:value-of
select="location_array/loc1_name"/></h1>
+
+ <div id="edit_check_list_menu" class="hor_menu">
+ <a>
+ <xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.edit_check_list_for_location</xsl:text>
+ <xsl:text>&check_list_id=</xsl:text>
+ <xsl:value-of select="check_list/id"/>
+ </xsl:attribute>
+ Vis detaljer for sjekkliste
+ </a>
+ <a class="active">
+ <xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.view_errors_for_check_list</xsl:text>
+ <xsl:text>&check_list_id=</xsl:text>
+ <xsl:value-of select="check_list/id"/>
+ </xsl:attribute>
+ Vis avvik/saker for sjekkliste
+ </a>
+ <a>
+ <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>
+ <xsl:value-of select="check_list/id"/>
+ </xsl:attribute>
+ Vis info om kontroll
+ </a>
+
+ <a style="background:#DD624B;border-bottom: 1px solid
#CB563F;border-top: 1px solid #EE836F;box-shadow: 0 1px 0 #A9422E, 0 -1px 0
#A9422E;color: #FFFFFF;height: 18px;margin-left: 40px;margin-top: 1px;">
+ <xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.register_error</xsl:text>
+ <xsl:text>&check_list_id=</xsl:text>
+ <xsl:value-of select="check_list/id"/>
+ </xsl:attribute>
+ Registrer avvik/sak
+ </a>
+ </div>
+
+
+ <a style="display:none;" id="view_open_errors">
+ <xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicheck_list.view_open_errors</xsl:text>
+ <xsl:text>&check_list_id=</xsl:text>
+ <xsl:value-of select="check_list/id"/>
+
<xsl:text>&phpgw_return_as=stripped_html</xsl:text>
+ </xsl:attribute>
+ </a>
+
+ <div id="load_view_content"></div>
+</div>
+</xsl:template>
Property changes on:
trunk/controller/templates/base/check_list/view_errors_for_check_list.xsl
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/controller/templates/base/css/base.css
===================================================================
--- trunk/controller/templates/base/css/base.css 2012-01-07 10:38:09 UTC
(rev 8513)
+++ trunk/controller/templates/base/css/base.css 2012-01-07 13:25:54 UTC
(rev 8514)
@@ -1091,6 +1091,7 @@
margin-left: 500px;
margin-right: 10px;
padding: 5px;
+ margin-top: 40px;
}
ul#icon_color_map li {
font-size: 12px;
@@ -1167,11 +1168,12 @@
float: right;
margin-top: 20px;
}
-
-#edit_check_list_menu a{
- float:left;
- width: 150px;
- text-align:center;
+#edit_check_list_menu a {
+ float: left;
+ height: 20px;
+ padding-top: 10px;
+ text-align: center;
+ width: 185px;
}
#edit_check_list_menu{
height:30px;
Deleted: trunk/controller/templates/base/view_calendar_month.xsl
===================================================================
--- trunk/controller/templates/base/view_calendar_month.xsl 2012-01-07
10:38:09 UTC (rev 8513)
+++ trunk/controller/templates/base/view_calendar_month.xsl 2012-01-07
13:25:54 UTC (rev 8514)
@@ -1,216 +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>
-<xsl:variable name="location_code"><xsl:value-of
select="location_array/location_code"/></xsl:variable>
-
-<div id="main_content">
-
- <h1>Kalenderoversikt for <xsl:value-of select="period"/></h1>
-
- <div style="float:left;">
- <fieldset class="location_details">
- <h3
style="margin:0;font-size:19px;"><xsl:value-of
select="location_array/loc1_name"/></h3>
- </fieldset>
- </div>
-
- <ul id="icon_color_map">
- <li><img height="13"
src="controller/images/status_icon_yellow_ring.png" /><span>Kontroll satt
opp</span></li>
- <li><img height="13"
src="controller/images/status_icon_yellow.png" /><span>Kontroll har planlagt
dato</span></li>
- <li><img height="13"
src="controller/images/status_icon_dark_green.png" /><span>Kontroll gjennomført
uten feil før frist</span></li>
- <li><img height="13"
src="controller/images/status_icon_light_green.png" /><span>Kontroll
gjennomført uten feil etter frist</span></li>
- <li><img height="13"
src="controller/images/status_icon_red_empty.png" /><span>Kontroll gjennomført
med rapporterte feil</span></li>
- <li><img height="11"
src="controller/images/status_icon_red_cross.png" /><span>Kontroll ikke
gjennomført</span></li>
- </ul>
-
- <div style="float: left;margin-bottom: 10px;margin-left:
735px;margin-top: 30px;"><a class="move_cal_right" href="#"><img
src="controller/images/arrow_left.png" width="16"/></a></div>
- <div style="float:left;margin-top: 30px;margin-left: 374px;"><a
class="move_cal_left" href="#"><img src="controller/images/arrow_right.png"
width="16"/></a></div>
-
- <script>
- $(document).ready(function() {
- $(".move_cal_left").click(function(){
- var leftStrVal =
$("#days_view").css("left");
- var leftNumVal =
leftStrVal.substring(0, leftStrVal.indexOf('px'));
-
- if(leftNumVal == -417){
- $("#days_view").animate({
- left: '-=93'
- }, 800);
- }else if(leftNumVal > -417){
- $("#days_view").animate({
- left: '-=417'
- }, 800);
- }
- });
-
- $(".move_cal_right").click(function(){
- var leftStrVal =
$("#days_view").css("left");
- var leftNumVal =
leftStrVal.substring(0, leftStrVal.indexOf('px'));
-
- if( leftNumVal != 0 ){
- if(leftNumVal == -93){
-
$("#days_view").animate({
- left: '+=93'
- }, 800);
- }else if( leftNumVal >= -510 ){
-
$("#days_view").animate({
- left: '+=417'
- }, 800);
- }
- }
- });
- });
- </script>
-
- <xsl:choose>
- <xsl:when test="controls_calendar_array/child::node()">
- <ul style="clear:left;" class="calendar info month">
- <li class="heading">
- <div class="id">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>
- </li>
-
- <xsl:for-each select="controls_calendar_array">
- <li>
- <div class="id">
- <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', $date_format, number(control/start_date))"/>
- </div>
- <div class="date">
- <xsl:choose>
- <xsl:when
test="control/end_date != 0">
- <xsl:value-of
select="php:function('date', $date_format, 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>
- </li>
- </xsl:for-each>
- </ul>
-
- <div id="days_wrp">
- <ul id="days_view" class="calendar days">
- <li class="heading">
- <xsl:for-each
select="heading_array">
- <div><xsl:value-of
select="."/></div>
- </xsl:for-each>
- </li>
-
- <xsl:for-each
select="controls_calendar_array">
- <li>
- <xsl:for-each
select="calendar_array">
- <xsl:choose>
-
<xsl:when test="status = 'control_registered'">
-
<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>&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_yellow_ring.png" />
-
</a>
-
</div>
-
</xsl:when>
-
<xsl:when test="status = 'control_planned'">
-
<div>
-
<a>
-
<xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.edit_check_list_for_location</xsl:text>
-
<xsl:text>&check_list_id=</xsl:text>
-
<xsl:value-of select="info/check_list_id"/>
-
</xsl:attribute>
-
<img height="15" src="controller/images/status_icon_yellow.png" />
-
</a>
-
</div>
-
</xsl:when>
-
<xsl:when test="status = 'control_accomplished_in_time_without_errors'">
-
<div>
-
<a>
-
<xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.edit_check_list_for_location</xsl:text>
-
<xsl:text>&check_list_id=</xsl:text>
-
<xsl:value-of select="info/check_list_id"/>
-
</xsl:attribute>
-
<span style="display:none"><xsl:value-of
select="info/id"/></span>
-
<img height="15"
src="controller/images/status_icon_dark_green.png" />
-
</a>
-
</div>
-
</xsl:when>
-
<xsl:when test="status = 'control_accomplished_over_time_without_errors'">
-
<div style="position:relative;">
-
<div id="info_box" style="position:absolute;display:none;"></div>
-
<a>
-
<xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.edit_check_list_for_location</xsl:text>
-
<xsl:text>&check_list_id=</xsl:text>
-
<xsl:value-of select="info/check_list_id"/>
-
</xsl:attribute>
-
<span style="display:none"><xsl:value-of
select="info/id"/></span>
-
<img height="15"
src="controller/images/status_icon_light_green.png" />
-
</a>
-
</div>
-
</xsl:when>
-
<xsl:when test="status = 'control_accomplished_with_errors'">
-
<div style="position:relative;">
-
<div id="info_box" style="position:absolute;display:none;"></div>
-
<a class="view_check_list">
-
<xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.edit_check_list_for_location</xsl:text>
-
<xsl:text>&check_list_id=</xsl:text>
-
<xsl:value-of select="info/check_list_id"/>
-
</xsl:attribute>
-
<span style="display:none">
-
<xsl:text>&check_list_id=</xsl:text><xsl:value-of
select="info/check_list_id"/>
-
<xsl:text>&phpgw_return_as=json</xsl:text>
-
</span>
-
<img height="15"
src="controller/images/status_icon_red_empty.png" />
-
</a>
-
</div>
-
</xsl:when>
-
<xsl:when test="status = 'control_canceled'">
-
<div>
-
<img height="12" src="controller/images/status_icon_red_cross.png" />
-
</div>
-
</xsl:when>
-
<xsl:when test="status = 'control_not_accomplished'">
-
<div>
-
<img height="12" src="controller/images/status_icon_red_cross.png" />
-
</div>
-
</xsl:when>
-
<xsl:otherwise>
-
<div></div>
-
</xsl:otherwise>
- </xsl:choose>
- </xsl:for-each>
- </li>
- </xsl:for-each>
- </ul>
- </div>
- </xsl:when>
- <xsl:otherwise>
- <div>Ingen sjekklister for bygg i angitt periode</div>
- </xsl:otherwise>
- </xsl:choose>
-</div>
-</xsl:template>
Deleted: trunk/controller/templates/base/view_calendar_year.xsl
===================================================================
--- trunk/controller/templates/base/view_calendar_year.xsl 2012-01-07
10:38:09 UTC (rev 8513)
+++ trunk/controller/templates/base/view_calendar_year.xsl 2012-01-07
13:25:54 UTC (rev 8514)
@@ -1,197 +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>
-<xsl:variable name="year"><xsl:value-of select="year"/></xsl:variable>
-<xsl:variable name="location_code"><xsl:value-of
select="location_array/location_code"/></xsl:variable>
-
-<div id="main_content">
-
- <h1>Kalenderoversikt for <xsl:value-of select="period"/></h1>
-
- <div style="float:left;">
- <fieldset class="location_details">
- <h3
style="margin:0;font-size:19px;"><xsl:value-of
select="location_array/loc1_name"/></h3>
- </fieldset>
- </div>
-
- <ul id="icon_color_map">
- <li><img height="13"
src="controller/images/status_icon_yellow_ring.png" /><span>Kontroll satt
opp</span></li>
- <li><img height="13"
src="controller/images/status_icon_yellow.png" /><span>Kontroll har planlagt
dato</span></li>
- <li><img height="13"
src="controller/images/status_icon_dark_green.png" /><span>Kontroll gjennomført
uten feil før frist</span></li>
- <li><img height="13"
src="controller/images/status_icon_light_green.png" /><span>Kontroll
gjennomført uten feil etter frist</span></li>
- <li><img height="13"
src="controller/images/status_icon_red_empty.png" /><span>Kontroll gjennomført
med rapporterte feil</span></li>
- <li><img height="11"
src="controller/images/status_icon_red_cross.png" /><span>Kontroll ikke
gjennomført</span></li>
- </ul>
-
- <ul class="calendar">
- <xsl:choose>
- <xsl:when
test="controls_calendar_array/child::node()">
-
- <li class="heading">
- <div class="id">ID</div>
- <div class="title">Tittel</div>
- <div class="date">Start dato</div>
- <div class="date">Slutt dato</div>
- <div
class="frequency">Frekvenstype</div>
- <div
class="frequency">Frekvensintervall</div>
- <div class="months">
- <xsl:for-each select="heading_array">
- <div>
- <a>
- <xsl:attribute
name="href">
-
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_month</xsl:text>
-
<xsl:text>&year=</xsl:text>
-
<xsl:value-of select="$year"/>
-
<xsl:text>&month=</xsl:text>
-
<xsl:number/>
- </xsl:attribute>
- <xsl:value-of
select="."/>
- </a>
- </div>
- </xsl:for-each>
- </div>
- </li>
-
- <xsl:for-each select="controls_calendar_array">
- <xsl:variable
name="control_id"><xsl:value-of select="control/id"/></xsl:variable>
- <li>
- <div class="id">
- <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', $date_format, number(control/start_date))"/>
- </div>
- <div class="date">
- <xsl:choose>
- <xsl:when
test="control/end_date != 0">
- <xsl:value-of
select="php:function('date', $date_format, 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>
- <div class="months">
- <xsl:for-each
select="calendar_array">
- <xsl:choose>
-
<xsl:when test="status = 'control_registered'">
-
<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>&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_yellow_ring.png" />
-
</a>
-
</div>
-
</xsl:when>
-
<xsl:when test="status = 'control_planned'">
-
<div>
-
<a>
-
<xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.edit_check_list_for_location</xsl:text>
-
<xsl:text>&check_list_id=</xsl:text>
-
<xsl:value-of select="info/check_list_id"/>
-
</xsl:attribute>
-
<img height="15" src="controller/images/status_icon_yellow.png" />
-
</a>
-
</div>
-
</xsl:when>
-
<xsl:when test="status = 'control_accomplished_in_time_without_errors'">
-
<div>
-
<a>
-
<xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.edit_check_list_for_location</xsl:text>
-
<xsl:text>&check_list_id=</xsl:text>
-
<xsl:value-of select="info/check_list_id"/>
-
</xsl:attribute>
-
<span style="display:none"><xsl:value-of
select="info/id"/></span>
-
<img height="15"
src="controller/images/status_icon_dark_green.png" />
-
</a>
-
</div>
-
</xsl:when>
-
<xsl:when test="status = 'control_accomplished_over_time_without_errors'">
-
<div style="position:relative;">
-
<div id="info_box" style="position:absolute;display:none;"></div>
-
<a>
-
<xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.edit_check_list_for_location</xsl:text>
-
<xsl:text>&check_list_id=</xsl:text>
-
<xsl:value-of select="info/check_list_id"/>
-
</xsl:attribute>
-
<span style="display:none"><xsl:value-of
select="info/id"/></span>
-
<img height="15"
src="controller/images/status_icon_light_green.png" />
-
</a>
-
</div>
-
</xsl:when>
-
<xsl:when test="status = 'control_accomplished_with_errors'">
-
<div style="position:relative;">
-
<div id="info_box" style="position:absolute;display:none;"></div>
-
<a class="view_check_list">
-
<xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.edit_check_list_for_location</xsl:text>
-
<xsl:text>&check_list_id=</xsl:text>
-
<xsl:value-of select="info/check_list_id"/>
-
</xsl:attribute>
-
<span style="display:none">
-
<xsl:text>&check_list_id=</xsl:text><xsl:value-of
select="info/check_list_id"/>
-
<xsl:text>&phpgw_return_as=json</xsl:text>
-
</span>
-
<img height="15" src="controller/images/status_icon_red.png" />
-
</a>
-
</div>
-
</xsl:when>
-
<xsl:when test="status = 'control_agg_accomplished_with_errors'">
-
<div style="background: url(controller/images/status_icon_red_empty.png)
no-repeat 50% 50%;">
-
<a style="color:#fff;font-weight:bold;text-decoration: none;font-size:10px;"
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="info/id"/>
-
</xsl:attribute>
-
<span><xsl:value-of select="info"/></span>
-
</a>
-
</div>
-
</xsl:when>
-
<xsl:when test="status = 'control_canceled'">
-
<div>
-
<img height="12" src="controller/images/status_icon_red_cross.png" />
-
</div>
-
</xsl:when>
-
<xsl:when test="status = 'control_not_accomplished'">
-
<div>
-
<img height="12" src="controller/images/status_icon_red_cross.png" />
-
</div>
-
</xsl:when>
-
<xsl:otherwise>
-
<div></div>
-
</xsl:otherwise>
- </xsl:choose>
-
- </xsl:for-each>
- </div>
- </li>
- </xsl:for-each>
- </xsl:when>
- <xsl:otherwise>
- <div>Ingen sjekklister for bygg i angitt
periode</div>
- </xsl:otherwise>
- </xsl:choose>
- </ul>
-</div>
-</xsl:template>
| [Prev in Thread] | Current Thread | [Next in Thread] |