[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [8600]
|
From: |
Torstein |
|
Subject: |
[Fmsystem-commits] [8600] |
|
Date: |
Wed, 18 Jan 2012 07:48:44 +0000 |
Revision: 8600
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8600
Author: vator
Date: 2012-01-18 07:48:44 +0000 (Wed, 18 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/component/class.calendar_builder.inc.php
trunk/controller/templates/base/calendar/view_calendar_year.xsl
trunk/controller/templates/base/check_list/view_closed_cases.xsl
trunk/controller/templates/base/check_list/view_open_cases.xsl
trunk/controller/templates/base/css/base.css
Added Paths:
-----------
trunk/controller/inc/helper/class.date_helper.inc.php
Modified: trunk/controller/inc/class.uicalendar.inc.php
===================================================================
--- trunk/controller/inc/class.uicalendar.inc.php 2012-01-17 17:43:10 UTC
(rev 8599)
+++ trunk/controller/inc/class.uicalendar.inc.php 2012-01-18 07:48:44 UTC
(rev 8600)
@@ -239,7 +239,7 @@
$month_controls_calendar_array =
$this->calendar_builder->build_calendar_array( $control_check_list_array, 12,
"view_months" );
$controls_calendar_array =
array_merge($days_controls_calendar_array, $month_controls_calendar_array);
- print_r($controls_calendar_array);
+
$location_array =
execMethod('property.bolocation.read_single', array('location_code' =>
$location_code));
$heading_array = array("Jan", "Feb", "Mar", "Apr",
"Mai", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Des");
Modified: trunk/controller/inc/class.uicheck_list.inc.php
===================================================================
--- trunk/controller/inc/class.uicheck_list.inc.php 2012-01-17 17:43:10 UTC
(rev 8599)
+++ trunk/controller/inc/class.uicheck_list.inc.php 2012-01-18 07:48:44 UTC
(rev 8600)
@@ -34,6 +34,7 @@
include_class('controller', 'check_list', 'inc/model/');
include_class('controller', 'check_item', 'inc/model/');
include_class('controller', 'status_checker', 'inc/helper/');
+ include_class('controller', 'date_helper', 'inc/helper/');
class controller_uicheck_list extends controller_uicommon
{
@@ -235,8 +236,8 @@
$completed_date = phpgw::get_var('completed_date');
$planned_date = phpgw::get_var('planned_date');
- $planned_date_ts = $this->get_timestamp_from_date(
$planned_date );
- $completed_date_ts = $this->get_timestamp_from_date(
$completed_date );
+ $planned_date_ts =
date_helper::get_timestamp_from_date( $planned_date );
+ $completed_date_ts =
date_helper::get_timestamp_from_date( $completed_date );
// Fetches check_list from DB
$update_check_list =
$this->so_check_list->get_single($check_list_id);
@@ -716,17 +717,4 @@
return $this->yui_results($results);
}
-
- function get_timestamp_from_date( $date_string ){
- $pos_day = strpos($date_string, "/");
- $day = substr($date_string, 0, $pos_day);
-
- $pos_month = strpos($date_string, "-");
- $len_month = $pos_month - $pos_day -1;
- $month = substr($date_string, $pos_day+1, $len_month);
-
- $year = substr($date_string, $pos_month + $len_month-1,
strlen($date_string)-1);
-
- return mktime(0, 0, 0, $month, $day, $year);
- }
}
Modified: trunk/controller/inc/class.uicheck_list_for_location.inc.php
===================================================================
--- trunk/controller/inc/class.uicheck_list_for_location.inc.php
2012-01-17 17:43:10 UTC (rev 8599)
+++ trunk/controller/inc/class.uicheck_list_for_location.inc.php
2012-01-18 07:48:44 UTC (rev 8600)
@@ -35,6 +35,7 @@
include_class('controller', 'check_list', 'inc/model/');
include_class('controller', 'date_generator', 'inc/component/');
include_class('controller', 'status_checker', 'inc/helper/');
+ include_class('controller', 'date_helper', 'inc/helper/');
class controller_uicheck_list_for_location extends controller_uicommon
{
@@ -430,13 +431,13 @@
$completed_date = phpgw::get_var('completed_date',
'string');
if($planned_date != '')
- $planned_date_ts =
$this->get_timestamp_from_date( $planned_date );
+ $planned_date_ts =
date_helper::get_timestamp_from_date( $planned_date );
if($deadline_date != '')
- $deadline_date_ts =
$this->get_timestamp_from_date( $deadline_date );
+ $deadline_date_ts =
date_helper::get_timestamp_from_date( $deadline_date );
if($completed_date != '')
- $completed_date_ts =
$this->get_timestamp_from_date( $completed_date );
+ $completed_date_ts =
date_helper::get_timestamp_from_date( $completed_date );
$check_list = new controller_check_list();
$check_list->set_location_code($location_code);
@@ -530,19 +531,6 @@
self::render_template_xsl(array('check_list/check_list_tab_menu','check_list/view_control_info'),
$data);
}
- function get_timestamp_from_date( $date_string ){
- $pos_day = strpos($date_string, "/");
- $day = substr($date_string, 0, $pos_day);
-
- $pos_month = strpos($date_string, "-");
- $len_month = $pos_month - $pos_day -1;
- $month = substr($date_string, $pos_day+1, $len_month);
-
- $year = substr($date_string, $pos_month + $len_month-1,
strlen($date_string)-1);
-
- return mktime(0, 0, 0, $month, $day, $year);
- }
-
public function query(){
$type_id = phpgw::get_var('type_id');
$return_results = phpgw::get_var('results', 'int',
'REQUEST', 0);
Modified: trunk/controller/inc/component/class.calendar_builder.inc.php
===================================================================
--- trunk/controller/inc/component/class.calendar_builder.inc.php
2012-01-17 17:43:10 UTC (rev 8599)
+++ trunk/controller/inc/component/class.calendar_builder.inc.php
2012-01-18 07:48:44 UTC (rev 8600)
@@ -17,7 +17,7 @@
foreach($control_array as $control){
$calendar_array = $this->init_calendar( $control,
$calendar_array, $num, $period_type );
- print_r($calendar_array);
+
// Inserts check_list object on deadline month in
twelve_months_array
foreach($control->get_check_lists_array() as
$check_list){
Added: trunk/controller/inc/helper/class.date_helper.inc.php
===================================================================
--- trunk/controller/inc/helper/class.date_helper.inc.php
(rev 0)
+++ trunk/controller/inc/helper/class.date_helper.inc.php 2012-01-18
07:48:44 UTC (rev 8600)
@@ -0,0 +1,18 @@
+<?php
+ class date_helper {
+
+ public function __construct(){}
+
+ public static function get_timestamp_from_date( $date_string ){
+ $pos_day = strpos($date_string, "/");
+ $day = substr($date_string, 0, $pos_day);
+
+ $pos_month = strpos($date_string, "-");
+ $len_month = $pos_month - $pos_day -1;
+ $month = substr($date_string, $pos_day+1, $len_month);
+
+ $year = substr($date_string, $pos_month + $len_month-1,
strlen($date_string)-1);
+
+ return mktime(0, 0, 0, $month, $day, $year);
+ }
+}
\ No newline at end of file
Modified: trunk/controller/templates/base/calendar/view_calendar_year.xsl
===================================================================
--- trunk/controller/templates/base/calendar/view_calendar_year.xsl
2012-01-17 17:43:10 UTC (rev 8599)
+++ trunk/controller/templates/base/calendar/view_calendar_year.xsl
2012-01-18 07:48:44 UTC (rev 8600)
@@ -11,13 +11,13 @@
<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 id="icon_color_map">
+ <li><img height="15"
src="controller/images/status_icon_yellow_ring.png" /><span>Kontroll satt
opp</span></li>
+ <li><img height="15"
src="controller/images/status_icon_yellow.png" /><span>Kontroll har planlagt
dato</span></li>
+ <li><img height="15"
src="controller/images/status_icon_dark_green.png" /><span>Kontroll gjennomført
uten feil før frist</span></li>
+ <li><img height="15"
src="controller/images/status_icon_light_green.png" /><span>Kontroll
gjennomført uten feil etter frist</span></li>
+ <li><img height="15"
src="controller/images/status_icon_red_empty.png" /><span>Kontroll gjennomført
med rapporterte feil</span></li>
+ <li><img height="15"
src="controller/images/status_icon_red_cross.png" /><span>Kontroll ikke
gjennomført</span></li>
</ul>
<ul class="calendar">
@@ -153,17 +153,22 @@
</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">
+
<div style="position:relative;background:
url(controller/images/status_icon_red_empty.png) no-repeat 50% 50%;">
+
<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.get_check_list_info</xsl:text>
-
<xsl:text>&phpgw_return_as=json</xsl:text>
+
<xsl:text>index.php?menuaction=controller.uicheck_list_for_location.edit_check_list</xsl:text>
<xsl:text>&check_list_id=</xsl:text>
-
<xsl:value-of select="info/id"/>
+
<xsl:value-of select="info/check_list_id"/>
</xsl:attribute>
-
<span><xsl:value-of select="info"/></span>
+
<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"/>
</a>
</div>
+
</xsl:when>
<xsl:when test="status = 'control_canceled'">
<div>
Modified: trunk/controller/templates/base/check_list/view_closed_cases.xsl
===================================================================
--- trunk/controller/templates/base/check_list/view_closed_cases.xsl
2012-01-17 17:43:10 UTC (rev 8599)
+++ trunk/controller/templates/base/check_list/view_closed_cases.xsl
2012-01-18 07:48:44 UTC (rev 8600)
@@ -36,7 +36,7 @@
</div>
</xsl:when>
<xsl:otherwise>
-
<div style="float:right;"><span style="color:red">Ingen
melding registrert!</span></div>
+
<div style="float:right;"><span style="color:red">Ingen
melding registrert</span></div>
</xsl:otherwise>
</xsl:choose>
</li>
Modified: trunk/controller/templates/base/check_list/view_open_cases.xsl
===================================================================
--- trunk/controller/templates/base/check_list/view_open_cases.xsl
2012-01-17 17:43:10 UTC (rev 8599)
+++ trunk/controller/templates/base/check_list/view_open_cases.xsl
2012-01-18 07:48:44 UTC (rev 8600)
@@ -36,7 +36,7 @@
</div>
</xsl:when>
<xsl:otherwise>
-
<div style="float:right;"><span style="color:red">Ingen
melding registrert!</span></div>
+
<div style="float:right;"><span style="color:red">Ingen
melding registrert</span></div>
</xsl:otherwise>
</xsl:choose>
</li>
Modified: trunk/controller/templates/base/css/base.css
===================================================================
--- trunk/controller/templates/base/css/base.css 2012-01-17 17:43:10 UTC
(rev 8599)
+++ trunk/controller/templates/base/css/base.css 2012-01-18 07:48:44 UTC
(rev 8600)
@@ -1002,7 +1002,7 @@
width: 440px;
padding:0;
}
-.calendar .months a{
+.calendar .heading a{
text-decoration: none;
color:#000;
}
@@ -1245,6 +1245,9 @@
text-decoration: none;
width: 24px;
}
+.months a.view_check_list {
+ width: 30px;
+}
.cal_info_msg{
font-size: 16px;
padding: 40px 20px;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [8600],
Torstein <=