[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9325] Merge 9321:9324 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [9325] Merge 9321:9324 from trunk |
|
Date: |
Wed, 09 May 2012 06:54:12 +0000 |
Revision: 9325
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9325
Author: sigurdne
Date: 2012-05-09 06:54:11 +0000 (Wed, 09 May 2012)
Log Message:
-----------
Merge 9321:9324 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/controller/inc/class.uicalendar.inc.php
branches/Version-1_0-branch/controller/inc/class.uicontrol.inc.php
branches/Version-1_0-branch/controller/js/controller/ajax.js
branches/Version-1_0-branch/controller/templates/base/css/base.css
branches/Version-1_0-branch/property/inc/class.bocommon.inc.php
branches/Version-1_0-branch/property/inc/class.soinvoice.inc.php
Added Paths:
-----------
branches/Version-1_0-branch/controller/inc/component/class.month_calendar.inc.php
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_month_for_locations.xsl
Property Changed:
----------------
branches/Version-1_0-branch/
Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499,7501-7502,7504,7506-7507,7509-7511,7513-7517,7519-7521,7523,7525,7527-7529,7531,7533,7535-7538,7540-7542,7544-7549,7551-7552,7554-7561,7563,7565,7567-7573,7575-7578,7580-7584,7586-7591,7593-7624,7627-7636,7638-7656,7658-7718,7720-7732,7734,7736,7738-7750,7754-7759,7761-7767,7769-7780,7782,7784-7809,7811-7812,7814-7835,7837-7847,7849-7887,7889-7895,7897,7899,7901,7903-7905,7907-7921,7923-7925,7927-7933,7935,7937-7952,7954-7968,7970-7974,7976,7978-7979,7981-7982,7984-7988,7990-7992,7994-8041,8043-8066,8068-8087,8089,8091-8108,8110-8124,8126-8129,8131,8133-8150,8152-8154,8156-8162,8164-8167,8169-8170,8172-8179,8181,8183-8196,8198-8207,8209-8211,8213-8214,8216-8217,8219-8220,8222,8224-8225,8227-8247,8249,8251,8253-8282,8284-8352,8354-8368,8370-8396,8398-8430,8432,8434-8440,8442-8445,8447-8453,8455-8456,8458,8460,8462-8464,8466-8473,8475-8479,8481,8483-8501,8503-8523,8525,8527-8531,8533,8535-8536,8538-8550,8552-8554,8556-8557,8559-8579,8581-8587,8589,8591-8592,8594-8595,8597-8601,8603-8610,8612-8613,8615,8617,8619-8645,8647-8650,8652-8661,8663-8666,8668-8669,8671-8683,8685-8691,8693-8730,8732-8737,8739,8741-8767,8769,8771-8772,8774,8776-8797,8799-8812,8814-8819,8821,8823-8833,8835-8837,8839,8841,8843-8849,8852-8858,8860-8867,8869-8870,8872,8874-8877,8879,8881,8883-8888,8890,8892-8901,8903-8911,8913-8917,8920-8923,8925-8933,8935-8938,8940-8943,8945,8947-8948,8950,8952-8953,8955-8962,8964,8966,8968-8970,8972-8975,8977-8983,8985-8993,8995-9001,9003,9005,9007,9009,9011-9019,9021-9023,9025,9027-9028,9030-9044,9046-9047,9049-9050,9052-9056,9058-9059,9061,9063-9064,9066-9068,9071-9092,9094-9112,9114-9117,9119,9121-9160,9162-9166,9169-9207,9209-9211,9213-9215,9217,9219,9221-9253,9255,9257,9259-9260,9262,9264-9269,9271-9273,9275,9277-9278,9280,9282-9283,9285-9289,9291-9299,9301-9310,9312-9313,9315-9320
+
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499,7501-7502,7504,7506-7507,7509-7511,7513-7517,7519-7521,7523,7525,7527-7529,7531,7533,7535-7538,7540-7542,7544-7549,7551-7552,7554-7561,7563,7565,7567-7573,7575-7578,7580-7584,7586-7591,7593-7624,7627-7636,7638-7656,7658-7718,7720-7732,7734,7736,7738-7750,7754-7759,7761-7767,7769-7780,7782,7784-7809,7811-7812,7814-7835,7837-7847,7849-7887,7889-7895,7897,7899,7901,7903-7905,7907-7921,7923-7925,7927-7933,7935,7937-7952,7954-7968,7970-7974,7976,7978-7979,7981-7982,7984-7988,7990-7992,7994-8041,8043-8066,8068-8087,8089,8091-8108,8110-8124,8126-8129,8131,8133-8150,8152-8154,8156-8162,8164-8167,8169-8170,8172-8179,8181,8183-8196,8198-8207,8209-8211,8213-8214,8216-8217,8219-8220,8222,8224-8225,8227-8247,8249,8251,8253-8282,8284-8352,8354-8368,8370-8396,8398-8430,8432,8434-8440,8442-8445,8447-8453,8455-8456,8458,8460,8462-8464,8466-8473,8475-8479,8481,8483-8501,8503-8523,8525,8527-8531,8533,8535-8536,8538-8550,8552-8554,8556-8557,8559-8579,8581-8587,8589,8591-8592,8594-8595,8597-8601,8603-8610,8612-8613,8615,8617,8619-8645,8647-8650,8652-8661,8663-8666,8668-8669,8671-8683,8685-8691,8693-8730,8732-8737,8739,8741-8767,8769,8771-8772,8774,8776-8797,8799-8812,8814-8819,8821,8823-8833,8835-8837,8839,8841,8843-8849,8852-8858,8860-8867,8869-8870,8872,8874-8877,8879,8881,8883-8888,8890,8892-8901,8903-8911,8913-8917,8920-8923,8925-8933,8935-8938,8940-8943,8945,8947-8948,8950,8952-8953,8955-8962,8964,8966,8968-8970,8972-8975,8977-8983,8985-8993,8995-9001,9003,9005,9007,9009,9011-9019,9021-9023,9025,9027-9028,9030-9044,9046-9047,9049-9050,9052-9056,9058-9059,9061,9063-9064,9066-9068,9071-9092,9094-9112,9114-9117,9119,9121-9160,9162-9166,9169-9207,9209-9211,9213-9215,9217,9219,9221-9253,9255,9257,9259-9260,9262,9264-9269,9271-9273,9275,9277-9278,9280,9282-9283,9285-9289,9291-9299,9301-9310,9312-9313,9315-9320,9322-9324
Modified: branches/Version-1_0-branch/controller/inc/class.uicalendar.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.uicalendar.inc.php
2012-05-09 06:52:56 UTC (rev 9324)
+++ branches/Version-1_0-branch/controller/inc/class.uicalendar.inc.php
2012-05-09 06:54:11 UTC (rev 9325)
@@ -38,6 +38,7 @@
include_class('controller', 'calendar_builder', 'inc/component/');
include_class('controller', 'location_finder', 'inc/helper/');
include_class('controller', 'year_calendar', 'inc/component/');
+ include_class('controller', 'month_calendar', 'inc/component/');
class controller_uicalendar extends controller_uicommon
{
@@ -55,7 +56,8 @@
'index' => true,
'view_calendar_for_month' =>
true,
'view_calendar_for_year' =>
true,
- 'view_calendar_for_locations' => true
+ 'view_calendar_year_for_locations' => true,
+ 'view_calendar_month_for_locations' => true
);
public function __construct()
@@ -134,9 +136,7 @@
$location_array =
execMethod('property.bolocation.read_single', array('location_code' =>
$location_code));
$property_array =
execMethod('property.solocation.read', array('type_id' => 1, 'allrows' =>
true));
-
-
$month_array = array("Januar", "Februar", "Mars",
"April", "Mai", "Juni", "Juli", "August", "September", "Oktober", "November",
"Desember");
for($i=1;$i<=$num_days_in_month;$i++){
@@ -242,8 +242,6 @@
$heading_array = array("Jan", "Feb", "Mar", "Apr",
"Mai", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Des");
- print_r($controls_calendar_array);
-
$data = array
(
'my_locations' =>
$my_locations,
@@ -261,7 +259,7 @@
self::add_javascript('controller', 'controller',
'ajax.js');
}
- public function view_calendar_for_locations()
+ public function view_calendar_year_for_locations()
{
$control_id = phpgw::get_var('control_id');
$control = $this->so_control->get_single($control_id);
@@ -280,9 +278,6 @@
$to_year = $year + 1;
$to_date_ts = strtotime("01/01/$to_year");
- //$this->calendar_builder = new
calendar_builder($from_date_ts, $to_date_ts);
-
- //$controls_with_check_lists_array = array();
$locations_with_calendar_array = array();
if($control->get_repeat_type() <= 1 ){
@@ -296,11 +291,11 @@
$calendar_array =
$year_calendar->build_agg_calendar($agg_open_cases_pr_month_array);
$locations_with_calendar_array[] =
array("location" => $curr_location_code, "calendar_array" => $calendar_array);
}
- }else if($control->get_repeat_type() == 2){
+ }else if($control->get_repeat_type() > 1){
foreach($locations_for_control_array as
$location){
$curr_location_code =
$location['location_code'];
- $repeat_type = 2;
+ $repeat_type =
$control->get_repeat_type();
$location_with_check_lists =
$this->so->get_check_lists_for_control_and_location($control_id,
$curr_location_code, $from_date_ts, $to_date_ts, $repeat_type);
$check_lists_array =
$location_with_check_lists["check_lists_array"];
@@ -310,22 +305,7 @@
$locations_with_calendar_array[] =
array("location" => $curr_location_code, "calendar_array" => $calendar_array);
}
- }else if($control->get_repeat_type() == 3){
- foreach($locations_for_control_array as
$location){
- $curr_location_code =
$location['location_code'];
-
- $repeat_type = 3;
- $location_with_check_lists =
$this->so->get_check_lists_for_control_and_location($control_id,
$curr_location_code, $from_date_ts, $to_date_ts, $repeat_type);
-
- $year_calendar = new
year_calendar($control, $year);
-
- $check_lists_array =
$location_with_check_lists["check_lists_array"];
-
- $calendar_array =
$year_calendar->build_calendar( $check_lists_array );
-
- $locations_with_calendar_array[] =
array("location" => $curr_location_code, "calendar_array" => $calendar_array);
- }
- }
+ }
$criteria = array
(
@@ -338,7 +318,6 @@
$location_finder = new location_finder();
$my_locations = $location_finder->get_responsibilities(
$criteria );
- //$controls_calendar_array =
$this->calendar_builder->build_calendar_array($controls_with_check_lists_array,
12, "view_months" );
$heading_array = array("Jan", "Feb", "Mar", "Apr",
"Mai", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Des");
$data = array
@@ -357,6 +336,95 @@
self::add_javascript('controller', 'controller',
'ajax.js');
}
+ public function view_calendar_month_for_locations()
+ {
+ $control_id = phpgw::get_var('control_id');
+ $control = $this->so_control->get_single($control_id);
+ $year = intval( phpgw::get_var('year') );
+ $month = intval( phpgw::get_var('month') );
+
+ if(is_numeric($control_id) & $control_id > 0)
+ {
+ $locations_for_control_array =
$this->so_control->get_locations_for_control($control_id);
+ }
+
+ if(empty($year)){
+ $year = intval( date("Y") );
+ }
+
+ if(empty($month)){
+ $month = date("n");
+ }
+
+ $from_month = $month;
+
+ $from_date_ts = strtotime("$from_month/01/$year");
+
+ if(($from_month + 1) > 12){
+ $to_month = 1;
+ $to_year = $year + 1;
+ }else{
+ $to_month = $from_month + 1;
+ $to_year = $year;
+ }
+
+ $to_date_ts = strtotime("$to_month/01/$to_year");
+
+ $locations_with_calendar_array = array();
+
+ foreach($locations_for_control_array as $location){
+ $curr_location_code =
$location['location_code'];
+
+ $repeat_type = $control->get_repeat_type();
+ $location_with_check_lists =
$this->so->get_check_lists_for_control_and_location($control_id,
$curr_location_code, $from_date_ts, $to_date_ts, $repeat_type);
+
+ $check_lists_array =
$location_with_check_lists["check_lists_array"];
+
+ $month_calendar = new month_calendar($control,
$year, $month);
+ $calendar_array =
$month_calendar->build_calendar( $check_lists_array );
+
+ $locations_with_calendar_array[] =
array("location" => $curr_location_code, "calendar_array" => $calendar_array);
+ }
+
+ $criteria = array
+ (
+ 'user_id' =>
$GLOBALS['phpgw_info']['user']['account_id'], //
+ 'type_id' => 1, // Nivå i bygningsregisteret
1:eiendom
+ 'role_id' => 0, // For å begrense til en
bestemt rolle - ellers listes alle roller for brukeren
+ 'allrows' => false
+ );
+
+ $location_finder = new location_finder();
+ $my_locations = $location_finder->get_responsibilities(
$criteria );
+
+
+ $month_array = array("Januar", "Februar", "Mars",
"April", "Mai", "Juni", "Juli", "August", "September", "Oktober", "November",
"Desember");
+
+ $num_days_in_month = cal_days_in_month(CAL_GREGORIAN,
$month, $year);
+
+ for($i=1;$i<=$num_days_in_month;$i++){
+ $heading_array[$i] = "$i";
+ }
+
+ $data = array
+ (
+ 'my_locations'
=> $my_locations,
+ 'view_location_code' =>
$location_code,
+ 'property_array'
=> $property_array,
+ 'location_array'
=> $location_array,
+ 'heading_array'
=> $heading_array,
+ 'locations_with_calendar_array' =>
$locations_with_calendar_array,
+ 'date_format'
=> $date_format,
+ 'period'
=> $month_array[ $month - 1],
+ 'month_nr'
=> $month,
+ 'year'
=> $year,
+ );
+
+ self::render_template_xsl(
array('calendar/view_calendar_month_for_locations',
'calendar/check_list_status_checker', 'calendar/icon_color_map'), $data);
+ self::add_javascript('controller', 'controller',
'jquery.js');
+ self::add_javascript('controller', 'controller',
'ajax.js');
+ }
+
public function
populate_controls_with_check_lists($controls_for_location_array,
$control_id_with_check_list_array){
$controls_with_check_list = array();
Modified: branches/Version-1_0-branch/controller/inc/class.uicontrol.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.uicontrol.inc.php
2012-05-09 06:52:56 UTC (rev 9324)
+++ branches/Version-1_0-branch/controller/inc/class.uicontrol.inc.php
2012-05-09 06:54:11 UTC (rev 9325)
@@ -878,7 +878,7 @@
foreach($results["results"] as &$res) {
$res['show_locations'] = array(
- 'href' => self::link(array('menuaction'
=> 'controller.uicalendar.view_calendar_for_locations', 'control_id' =>
$res['id'])),
+ 'href' => self::link(array('menuaction'
=> 'controller.uicalendar.view_calendar_year_for_locations', 'control_id' =>
$res['id'])),
'label' =>
lang('show_controls_for_location'),
);
}
Copied:
branches/Version-1_0-branch/controller/inc/component/class.month_calendar.inc.php
(from rev 9324, trunk/controller/inc/component/class.month_calendar.inc.php)
===================================================================
---
branches/Version-1_0-branch/controller/inc/component/class.month_calendar.inc.php
(rev 0)
+++
branches/Version-1_0-branch/controller/inc/component/class.month_calendar.inc.php
2012-05-09 06:54:11 UTC (rev 9325)
@@ -0,0 +1,85 @@
+<?php
+phpgw::import_class('controller.socheck_list');
+include_class('controller', 'date_generator', 'inc/component/');
+include_class('controller', 'check_list_status_info', 'inc/helper/');
+include_class('controller', 'check_list_status_manager', 'inc/helper/');
+
+/* This class transforms controls with checklists or controls with aggregated
number of open cases,
+* and puts these values in a calendar array for each control
+*/
+
+class month_calendar {
+
+ private $period_start_date_ts;
+ private $period_end_date_ts;
+ private $year;
+ private $month;
+ private $control;
+ private $calendar_array = array();
+
+ public function __construct($control, $year, $month){
+ $this->year = $year;
+ $this->month = $month;
+ $this->control = $control;
+
+ $from_month = $month;
+
+ $from_date_ts = strtotime("$from_month/01/$year");
+
+ if(($from_month + 1) > 12){
+ $to_month = 1;
+ $to_year = $year + 1;
+ }else{
+ $to_month = $from_month + 1;
+ $to_year = $year;
+ }
+
+ $to_date_ts = strtotime("$to_month/01/$to_year");
+
+ $this->period_start_date_ts = $from_date_ts;
+ $this->period_end_date_ts = $to_date_ts;
+
+ $this->init_calendar();
+ }
+
+ function init_calendar(){
+
+ $this->calendar_array = array();
+
+ for($i=1;$i<=$num;$i++){
+ $this->calendar_array[$i] = null;
+ }
+
+ $date_generator = new
date_generator($this->control->get_start_date(),
$this->control->get_end_date(), $this->period_start_date_ts,
$this->period_end_date_ts, $this->control->get_repeat_type(),
$this->control->get_repeat_interval());
+ $dates_array = $date_generator->get_dates();
+
+ // Inserts dates
+ foreach($dates_array as $date){
+
+ $todays_date = mktime(0,0,0,date("m"), date("d"),
date("Y"));
+
+ if($date < $todays_date){
+ $status = "CONTROL_NOT_DONE";
+ }else{
+ $status = "CONTROL_REGISTERED";
+ }
+
+ $this->calendar_array[ date("j", $date) ]["status"] =
$status;
+ $this->calendar_array[ date("j", $date) ]["info"] =
array("date" => $date, "control_id" => $this->control->get_id());
+ }
+ }
+
+ // Function that puts checklists into a twelve months array for
displaying a year or a days array for displaying a month
+ public function build_calendar( $check_lists_array ){
+
+ foreach($check_lists_array as $check_list){
+ $check_list_status_manager = new
check_list_status_manager( $check_list );
+ $check_list_status_info =
$check_list_status_manager->get_status_for_check_list();
+
+ $this->calendar_array[ date("j",
$check_list->get_deadline()) ]["status"] =
$check_list_status_info->get_status();
+ $this->calendar_array[ date("j",
$check_list->get_deadline()) ]["info"] = $check_list_status_info->serialize();
+ }
+
+ return $this->calendar_array;
+ }
+}
\ No newline at end of file
Modified: branches/Version-1_0-branch/controller/js/controller/ajax.js
===================================================================
--- branches/Version-1_0-branch/controller/js/controller/ajax.js
2012-05-09 06:52:56 UTC (rev 9324)
+++ branches/Version-1_0-branch/controller/js/controller/ajax.js
2012-05-09 06:54:11 UTC (rev 9325)
@@ -673,8 +673,9 @@
$(submitBnt).addClass("not_active");
}, 1000);
- $(thisForm).delay(1500).slideUp(500);
-
$(thisForm).parents("ul.expand_list").find("h4 img").delay(1500).attr("src",
"controller/images/arrow_right.png");
+ $(thisForm).delay(1500).slideUp(500,
function(){
+
$(thisForm).parents("ul.expand_list").find("h4 img").attr("src",
"controller/images/arrow_right.png");
+ });
}
}
}
Copied:
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_month_for_locations.xsl
(from rev 9324,
trunk/controller/templates/base/calendar/view_calendar_month_for_locations.xsl)
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_month_for_locations.xsl
(rev 0)
+++
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_month_for_locations.xsl
2012-05-09 06:54:11 UTC (rev 9325)
@@ -0,0 +1,95 @@
+<!-- $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>
+
+<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>
+
+ <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">
+ <xsl:call-template name="icon_color_map" />
+ </div>
+ <div id="cal_wrp">
+ <ul class="calendar">
+ <li class="heading">
+ <div class="control_details_wrp">
+ <div
class="location">Lokasjon</div>
+ </div>
+ <div class="days_wrp">
+ <xsl:for-each
select="heading_array">
+ <div>
+ <a>
+
<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:text>&month=</xsl:text>
+
<xsl:number/>
+
</xsl:attribute>
+
<xsl:value-of select="."/>
+ </a>
+ </div>
+ </xsl:for-each>
+ </div>
+ </li>
+
+ <xsl:choose>
+ <xsl:when
test="locations_with_calendar_array/child::node()">
+
+ <xsl:for-each
select="locations_with_calendar_array">
+ <li>
+ <xsl:choose>
+ <xsl:when test="(position() mod
2) != 1">
+ <xsl:attribute
name="class">odd</xsl:attribute>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:attribute
name="class">even</xsl:attribute>
+ </xsl:otherwise>
+ </xsl:choose>
+
+ <div class="control_details_wrp">
+ <div class="location">
+ <xsl:value-of
select="location"/>
+ </div>
+ </div>
+ <div class="days_wrp">
+ <xsl:for-each
select="calendar_array">
+
<xsl:call-template name="check_list_status_checker" >
+
<xsl:with-param name="location_code"><xsl:value-of
select="//location"/></xsl:with-param>
+
</xsl:call-template>
+ </xsl:for-each>
+ </div>
+ </li>
+ </xsl:for-each>
+ </xsl:when>
+ <xsl:otherwise>
+ <div class="cal_info_msg">Ingen sjekklister for
bygg i angitt periode</div>
+ </xsl:otherwise>
+ </xsl:choose>
+ </ul>
+ </div>
+</div>
+</div>
+</xsl:template>
Modified: branches/Version-1_0-branch/controller/templates/base/css/base.css
===================================================================
--- branches/Version-1_0-branch/controller/templates/base/css/base.css
2012-05-09 06:52:56 UTC (rev 9324)
+++ branches/Version-1_0-branch/controller/templates/base/css/base.css
2012-05-09 06:54:11 UTC (rev 9325)
@@ -1007,7 +1007,7 @@
}
ul.calendar div.location {
text-align: left;
- width: 600px;
+ width: 100px;
}
.control_details_wrp div.assigned {
text-align: left;
Modified: branches/Version-1_0-branch/property/inc/class.bocommon.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.bocommon.inc.php
2012-05-09 06:52:56 UTC (rev 9324)
+++ branches/Version-1_0-branch/property/inc/class.bocommon.inc.php
2012-05-09 06:54:11 UTC (rev 9325)
@@ -360,8 +360,19 @@
}
}
- if(!$users = $this->socommon->fm_cache('acl_userlist_'.
$rights[0] . '_' . $acl_location))
+ $right_index = 0;
+
+ foreach ($rights as $right)
{
+ $right_index += $right;
+ }
+
+ $acl_userlist_name =
"acl_userlist_{$right_index}_{$acl_location}";
+
+ reset($rights);
+
+ if(!$users =
$this->socommon->fm_cache($acl_userlist_name))
+ {
$users_gross = array();
foreach ($rights as $right)
{
Modified: branches/Version-1_0-branch/property/inc/class.soinvoice.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.soinvoice.inc.php
2012-05-09 06:52:56 UTC (rev 9324)
+++ branches/Version-1_0-branch/property/inc/class.soinvoice.inc.php
2012-05-09 06:54:11 UTC (rev 9325)
@@ -1103,7 +1103,7 @@
$dimb = (int) $dimb;
$role_id = (int) $role_id;
$sql = "SELECT user_id FROM fm_ecodimb_role_user"
- ." WHERE role_id = {$role_id} AND ecodimb = {$dimb} AND
expired_on IS NULL AND default_user = 1";
+ ." WHERE role_id = {$role_id} AND ecodimb = {$dimb} AND
expired_on IS NULL AND default_user = 1 AND active_from < " . time(). ' AND
(active_to > ' . time() . ' OR active_to = 0)';
//_debug_array($sql);
$this->db->query($sql,__LINE__,__FILE__);
$this->db->next_record();
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [9325] Merge 9321:9324 from trunk,
Sigurd Nes <=