[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9361]
|
From: |
Torstein |
|
Subject: |
[Fmsystem-commits] [9361] |
|
Date: |
Thu, 10 May 2012 13:45:40 +0000 |
Revision: 9361
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9361
Author: vator
Date: 2012-05-10 13:45:38 +0000 (Thu, 10 May 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/controller/inc/class.uicalendar.inc.php
trunk/controller/inc/component/class.year_calendar.inc.php
trunk/controller/templates/base/calendar/check_list_status_checker.xsl
trunk/controller/templates/base/calendar/view_calendar_month.xsl
trunk/controller/templates/base/calendar/view_calendar_month_for_locations.xsl
trunk/controller/templates/base/calendar/view_calendar_year.xsl
trunk/controller/templates/base/calendar/view_calendar_year_for_locations.xsl
trunk/controller/templates/base/css/base.css
Modified: trunk/controller/inc/class.uicalendar.inc.php
===================================================================
--- trunk/controller/inc/class.uicalendar.inc.php 2012-05-10 12:48:50 UTC
(rev 9360)
+++ trunk/controller/inc/class.uicalendar.inc.php 2012-05-10 13:45:38 UTC
(rev 9361)
@@ -132,13 +132,13 @@
'my_locations' =>
$my_locations,
'view_location_code' => $location_code,
'property_array' =>
$property_array,
- 'location_array' =>
$location_array,
+ 'current_location' =>
$location_array,
'heading_array' =>
month_calendar::get_heading_array($year, $month),
'controls_calendar_array' =>
$controls_calendar_array,
'date_format' =>
$date_format,
- 'period' =>
month_calendar::get_month_name($month-1),
- 'month_nr' =>
$month,
- 'year' =>
$year,
+ 'current_month' =>
month_calendar::get_month_name($month-1),
+ 'current_year' => $year,
+ 'current_month_nr' => $month
);
self::add_javascript('controller', 'controller',
'jquery.js');
@@ -240,12 +240,11 @@
(
'my_locations' =>
$my_locations,
'view_location_code' => $location_code,
- 'location_array' =>
$location_array,
+ 'current_location' => $location_array,
'heading_array' =>
$heading_array,
'controls_calendar_array' =>
$controls_calendar_array,
'date_format' =>
$date_format,
- 'period' =>
$year,
- 'year' =>
$year
+ 'current_year' => $year,
);
self::render_template_xsl(
array('calendar/view_calendar_year', 'calendar/check_list_status_checker',
'calendar/icon_color_map'), $data);
Modified: trunk/controller/inc/component/class.year_calendar.inc.php
===================================================================
--- trunk/controller/inc/component/class.year_calendar.inc.php 2012-05-10
12:48:50 UTC (rev 9360)
+++ trunk/controller/inc/component/class.year_calendar.inc.php 2012-05-10
13:45:38 UTC (rev 9361)
@@ -70,7 +70,7 @@
$status = "CONTROLS_DONE_WITH_ERRORS";
$this->calendar_array[$status_agg_month_info->get_month_nr()]["status"] =
$status;
-
$this->calendar_array[$status_agg_month_info->get_month_nr()]["info"] =
$status_agg_month_info->get_agg_open_cases();
+
$this->calendar_array[$status_agg_month_info->get_month_nr()]["info"]["agg_open_errors"]
= $status_agg_month_info->get_agg_open_cases();
}
return $this->calendar_array;
Modified: trunk/controller/templates/base/calendar/check_list_status_checker.xsl
===================================================================
--- trunk/controller/templates/base/calendar/check_list_status_checker.xsl
2012-05-10 12:48:50 UTC (rev 9360)
+++ trunk/controller/templates/base/calendar/check_list_status_checker.xsl
2012-05-10 13:45:38 UTC (rev 9361)
@@ -116,15 +116,21 @@
<div id="info_box"></div>
<a class="view_info_box">
<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="info/check_list_id"/>
+
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_month</xsl:text>
+
<xsl:text>&control_id=</xsl:text>
+ <xsl:value-of
select="//control/id"/>
+
<xsl:text>&location_code=</xsl:text>
+ <xsl:value-of
select="//current_location/location_code"/>
+
<xsl:text>&year=</xsl:text>
+ <xsl:value-of
select="//current_year"/>
+
<xsl:text>&month=</xsl:text>
+ <xsl:number />
</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>
- <xsl:value-of
select="info"/>
+ <xsl:value-of
select="info/agg_open_errors"/>
</a>
</div>
</td>
Modified: trunk/controller/templates/base/calendar/view_calendar_month.xsl
===================================================================
--- trunk/controller/templates/base/calendar/view_calendar_month.xsl
2012-05-10 12:48:50 UTC (rev 9360)
+++ trunk/controller/templates/base/calendar/view_calendar_month.xsl
2012-05-10 13:45:38 UTC (rev 9361)
@@ -7,8 +7,8 @@
<div id="main_content">
<div id="control_plan">
<div class="top">
- <h1><xsl:value-of
select="location_array/loc1_name"/></h1>
- <h3>Kalenderoversikt for <xsl:value-of
select="period"/><span class="year"><xsl:value-of select="year"/></span></h3>
+ <h1>Kontrollplan for bygg/eiendom: <xsl:value-of
select="current_location/loc1_name"/></h1>
+ <h3>Kalenderoversikt for <xsl:value-of
select="current_month"/><span class="year"><xsl:value-of
select="current_year"/></span></h3>
<form action="#">
<input type="hidden" name="period_type"
value="view_year" />
@@ -52,6 +52,30 @@
</xsl:attribute>
Årsoversikt
</a>
+ <a style="display:block;font-weight: bold;font-size:
14px;float:left;">
+ <xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_year</xsl:text>
+ <xsl:text>&year=</xsl:text>
+ <xsl:value-of select="current_year"/>
+ <xsl:text>&month=</xsl:text>
+ <xsl:value-of select="current_month -
1"/>
+ <xsl:text>&location_code=</xsl:text>
+ <xsl:value-of select="$location_code"/>
+ </xsl:attribute>
+ <xsl:value-of select="current_month"/>
+ </a>
+ <a style="display:block;font-weight: bold;font-size:
14px;float:left;">
+ <xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_year</xsl:text>
+ <xsl:text>&year=</xsl:text>
+ <xsl:value-of select="current_year"/>
+ <xsl:text>&month=</xsl:text>
+ <xsl:value-of select="current_month +
1"/>
+ <xsl:text>&location_code=</xsl:text>
+ <xsl:value-of select="$location_code"/>
+ </xsl:attribute>
+ <xsl:value-of select="current_month + 1"/>
+ </a>
<!--
<select id="loc_1" class="choose_loc">
<xsl:for-each select="property_array">
@@ -106,8 +130,19 @@
</td>
<td class="frequency">
<span>
- <xsl:value-of
select="control/repeat_type_label"/>
- <xsl:value-of
select="control/repeat_interval"/>
+ <xsl:choose>
+ <xsl:when
test="control/repeat_interval = 1">
+ <span
class="pre">Hver</span>
+ </xsl:when>
+ <xsl:when
test="control/repeat_interval = 2">
+ <span
class="pre">Annenhver</span>
+ </xsl:when>
+ <xsl:when
test="control/repeat_interval > 2">
+ <span
class="pre">Hver</span><span><xsl:value-of
select="control/repeat_interval"/>.</span>
+ </xsl:when>
+ </xsl:choose>
+
+ <span
class="val"><xsl:value-of select="control/repeat_type_label"/></span>
</span>
</td>
Modified:
trunk/controller/templates/base/calendar/view_calendar_month_for_locations.xsl
===================================================================
---
trunk/controller/templates/base/calendar/view_calendar_month_for_locations.xsl
2012-05-10 12:48:50 UTC (rev 9360)
+++
trunk/controller/templates/base/calendar/view_calendar_month_for_locations.xsl
2012-05-10 13:45:38 UTC (rev 9361)
@@ -1,14 +1,14 @@
<!-- $Id: view_calendar_year.xsl 9206 2012-04-23 06:21:38Z vator $ -->
<xsl:template match="data" 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="current_year"><xsl:value-of
select="current_year"/></xsl:variable>
+<xsl:variable name="current_month"><xsl:value-of
select="current_month"/></xsl:variable>
<div id="main_content">
-
<div id="control_plan">
<div class="top">
<h1>Kontrollplan for <xsl:value-of
select="control/title"/></h1>
- <h3>Periode: <xsl:value-of select="period"/></h3>
+ <h3>Periode: <xsl:value-of select="$current_year"/></h3>
<form action="#">
<input type="hidden" name="period_type"
value="view_year" />
@@ -41,6 +41,18 @@
</xsl:attribute>
Årsoversikt
</a>
+ <a style="display:block;font-weight: bold;font-size:
14px;float:left;">
+ <xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_month_for_locations</xsl:text>
+ <xsl:text>&year=</xsl:text>
+ <xsl:value-of select="current_year"/>
+ <xsl:text>&month=</xsl:text>
+ <xsl:value-of select="current_month"/>
+ <xsl:text>&control_id=</xsl:text>
+ <xsl:value-of select="control/id"/>
+ </xsl:attribute>
+ Årsoversikt
+ </a>
</div>
<div id="cal_wrp">
<table id="calendar" class="month">
Modified: trunk/controller/templates/base/calendar/view_calendar_year.xsl
===================================================================
--- trunk/controller/templates/base/calendar/view_calendar_year.xsl
2012-05-10 12:48:50 UTC (rev 9360)
+++ trunk/controller/templates/base/calendar/view_calendar_year.xsl
2012-05-10 13:45:38 UTC (rev 9361)
@@ -8,8 +8,8 @@
<div id="control_plan">
<div class="top">
- <h1>Kontrollplan for <xsl:value-of
select="location_array/loc1_name"/></h1>
- <h3 style="margin:0;font-size:19px;">Periode:
<xsl:value-of select="period"/></h3>
+ <h1>Kontrollplan for bygg/eiendom: <xsl:value-of
select="current_location/loc1_name"/></h1>
+ <h3>Kalenderoversikt for <span
class="year"><xsl:value-of select="current_year"/></span></h3>
<form action="#">
<input type="hidden" name="period_type"
value="view_year" />
@@ -56,7 +56,7 @@
<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:value-of select="//current_year"/>
<xsl:text>&location_code=</xsl:text>
<xsl:value-of select="$view_location_code"/>
<xsl:text>&month=</xsl:text>
@@ -90,7 +90,21 @@
<span><xsl:value-of
select="control/responsibility_name"/></span>
</td>
<td class="frequency">
- <span><xsl:value-of
select="control/repeat_type_label"/></span>
+ <span>
+ <xsl:choose>
+
<xsl:when test="control/repeat_interval = 1">
+
<span class="pre">Hver</span>
+
</xsl:when>
+
<xsl:when test="control/repeat_interval = 2">
+
<span class="pre">Annenhver</span>
+
</xsl:when>
+
<xsl:when test="control/repeat_interval > 2">
+
<span class="pre">Hver</span><span><xsl:value-of
select="control/repeat_interval"/>.</span>
+
</xsl:when>
+ </xsl:choose>
+
+ <span
class="val"><xsl:value-of select="control/repeat_type_label"/></span>
+ </span>
</td>
<xsl:for-each
select="calendar_array">
<xsl:call-template name="check_list_status_checker" >
Modified:
trunk/controller/templates/base/calendar/view_calendar_year_for_locations.xsl
===================================================================
---
trunk/controller/templates/base/calendar/view_calendar_year_for_locations.xsl
2012-05-10 12:48:50 UTC (rev 9360)
+++
trunk/controller/templates/base/calendar/view_calendar_year_for_locations.xsl
2012-05-10 13:45:38 UTC (rev 9361)
@@ -46,7 +46,7 @@
<xsl:attribute
name="href">
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_month_for_locations</xsl:text>
<xsl:text>&year=</xsl:text>
-
<xsl:value-of select="$year"/>
+
<xsl:value-of select="$current_year"/>
<xsl:text>&month=</xsl:text>
<xsl:number/>
<xsl:text>&control_id=</xsl:text>
Modified: trunk/controller/templates/base/css/base.css
===================================================================
--- trunk/controller/templates/base/css/base.css 2012-05-10 12:48:50 UTC
(rev 9360)
+++ trunk/controller/templates/base/css/base.css 2012-05-10 13:45:38 UTC
(rev 9361)
@@ -980,17 +980,19 @@
padding: 0 10px;
width: 100px;
}
-
-#calendar .title, #calendar .location_name {
- text-align: left;
-}
-#calendar .heading .title {
- text-align: center;
-}
#calendar .frequency {
margin-right: 10px;
width: 65px;
}
+#calendar .frequency, #calendar .title, #calendar .assigned, #calendar
.location_name {
+ text-align: left;
+}
+#calendar .frequency .pre {
+ margin-right: 3px;
+}
+#calendar .frequency .val {
+ text-transform: lowercase;
+}
.cal_info_msg {
font-size: 16px;
padding: 40px 20px;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [9361],
Torstein <=