[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9811]
|
From: |
Torstein |
|
Subject: |
[Fmsystem-commits] [9811] |
|
Date: |
Fri, 20 Jul 2012 10:19:54 +0000 |
Revision: 9811
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9811
Author: vator
Date: 2012-07-20 10:19:54 +0000 (Fri, 20 Jul 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/controller/inc/component/class.year_calendar_agg.inc.php
trunk/controller/inc/helper/class.check_list_status_updater.inc.php
trunk/controller/setup/phpgw_no.lang
trunk/controller/templates/base/calendar/check_list_status_manager.xsl
trunk/controller/templates/base/calendar/view_calendar_month_for_locations.xsl
Modified: trunk/controller/inc/component/class.year_calendar_agg.inc.php
===================================================================
--- trunk/controller/inc/component/class.year_calendar_agg.inc.php
2012-07-20 08:47:51 UTC (rev 9810)
+++ trunk/controller/inc/component/class.year_calendar_agg.inc.php
2012-07-20 10:19:54 UTC (rev 9811)
@@ -28,26 +28,25 @@
for($month_nr = 1;$month_nr <= 12;$month_nr++)
{
- if( ($month_nr < $start_month_nr) || ($month_nr > $end_month_nr))
+ if( ($month_nr < $start_month_nr) || ($month_nr > $end_month_nr) )
{
$this->calendar_array[ $month_nr ] = null;
}
else if( $month_nr < date("m") )
{
$this->calendar_array[ $month_nr ]["status"] =
"CONTROLS_NOT_DONE";
- $this->calendar_array[ $month_nr ]["info"] =
array("location_code" => $this->location_code, "year" => $this->year, "month"
=> $month_nr);
+ $this->calendar_array[ $month_nr ]["info"] = array("view" =>
"LOCATIONS_FOR_CONTROL", "control_id" => $this->control->get_id(), "year" =>
$this->year, "month" => $month_nr);
}
else
{
$this->calendar_array[ $month_nr ]["status"] =
"CONTROLS_REGISTERED";
- $this->calendar_array[ $month_nr ]["info"] =
array("location_code" => $this->location_code, "year" => $this->year, "month"
=> $month_nr);
+ $this->calendar_array[ $month_nr ]["info"] = array("view" =>
"LOCATIONS_FOR_CONTROL", "control_id" => $this->control->get_id(), "year" =>
$this->year, "month" => $month_nr);
}
}
}
public function build_calendar( $agg_open_cases_pr_month_array )
{
-
foreach($agg_open_cases_pr_month_array as
$status_agg_month_info)
{
$status = "CONTROLS_DONE_WITH_ERRORS";
Modified: trunk/controller/inc/helper/class.check_list_status_updater.inc.php
===================================================================
--- trunk/controller/inc/helper/class.check_list_status_updater.inc.php
2012-07-20 08:47:51 UTC (rev 9810)
+++ trunk/controller/inc/helper/class.check_list_status_updater.inc.php
2012-07-20 10:19:54 UTC (rev 9811)
@@ -23,7 +23,6 @@
$num_pending_cases = 0;
foreach($check_items as $check_item){
-
foreach($check_item->get_cases_array() as
$case){
if($case->get_status() ==
controller_check_item_case::STATUS_OPEN){
Modified: trunk/controller/setup/phpgw_no.lang
===================================================================
--- trunk/controller/setup/phpgw_no.lang 2012-07-20 08:47:51 UTC (rev
9810)
+++ trunk/controller/setup/phpgw_no.lang 2012-07-20 10:19:54 UTC (rev
9811)
@@ -353,5 +353,5 @@
error_msg_1 controller no Vennligst fyll inn dette feltet
error_msg_2 controller no Vennligst velg en verdi i listen
error_msg_3 controller no Vennligst angi sluttdato etter startdato
-error_msg_no_controls_in_period controller no Ingen
kontroller for bygg i denne periode
-error_msg_no_controls_for_component controller no Ingen
kontroller for komponent i denne periode
\ No newline at end of file
+error_msg_no_controls_in_period controller no Ingen
kontroller for bygg i denne perioden
+error_msg_no_controls_for_component controller no Ingen
kontroller for komponent i denne perioden
\ No newline at end of file
Modified: trunk/controller/templates/base/calendar/check_list_status_manager.xsl
===================================================================
--- trunk/controller/templates/base/calendar/check_list_status_manager.xsl
2012-07-20 08:47:51 UTC (rev 9810)
+++ trunk/controller/templates/base/calendar/check_list_status_manager.xsl
2012-07-20 10:19:54 UTC (rev 9811)
@@ -159,7 +159,14 @@
<div id="info_box"></div>
<a class="view_info_box">
<xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_month</xsl:text>
+ <xsl:choose>
+ <xsl:when
test="info/view = 'LOCATIONS_FOR_CONTROL'">
+
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_month_for_location</xsl:text>
+ </xsl:when>
+ <xsl:otherwise>
+
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_month</xsl:text>
+ </xsl:otherwise>
+ </xsl:choose>
<xsl:text>&control_id=</xsl:text>
<xsl:value-of
select="info/control_id"/>
<xsl:text>&location_code=</xsl:text>
@@ -180,9 +187,18 @@
<xsl:when test="status = 'CONTROLS_REGISTERED'">
<a>
<xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_month</xsl:text>
- <xsl:text>&location_code=</xsl:text>
- <xsl:value-of
select="info/location_code"/>
+ <xsl:choose>
+ <xsl:when
test="info/view = 'LOCATIONS_FOR_CONTROL'">
+
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_month_for_locations</xsl:text>
+
<xsl:text>&control_id=</xsl:text>
+
<xsl:value-of select="info/control_id"/>
+ </xsl:when>
+ <xsl:otherwise>
+
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_month</xsl:text>
+
<xsl:text>&location_code=</xsl:text>
+
<xsl:value-of select="info/location_code"/>
+ </xsl:otherwise>
+ </xsl:choose>
<xsl:text>&month=</xsl:text>
<xsl:value-of select="info/month"/>
<xsl:text>&year=</xsl:text>
Modified:
trunk/controller/templates/base/calendar/view_calendar_month_for_locations.xsl
===================================================================
---
trunk/controller/templates/base/calendar/view_calendar_month_for_locations.xsl
2012-07-20 08:47:51 UTC (rev 9810)
+++
trunk/controller/templates/base/calendar/view_calendar_month_for_locations.xsl
2012-07-20 10:19:54 UTC (rev 9811)
@@ -7,24 +7,6 @@
<div class="top">
<h1>Kontrollplan for <xsl:value-of
select="control/title"/></h1>
<h3>Periode: <xsl:value-of select="current_year"/></h3>
-
- <form action="#">
- <input type="hidden" name="period_type"
value="view_year" />
- <input type="hidden" name="year">
- <xsl:attribute name="value">
- <xsl:value-of select="year"/>
- </xsl:attribute>
- </input>
-
- <select id="choose_my_location">
- <xsl:for-each select="my_locations">
- <xsl:variable
name="loc_code"><xsl:value-of select="location_code"/></xsl:variable>
- <option value="{$loc_code}">
- <xsl:value-of
disable-output-escaping="yes" select="loc1_name"/>
- </option>
- </xsl:for-each>
- </select>
- </form>
</div>
<div class="middle">
<!-- ===================== ICON COLOR MAP
================= -->
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [9811],
Torstein <=