[Fmsystem-commits] [15636] Stable: Merge 15631:15635 from trunk

[sigurdne]

Revision: 15636
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15636
Author:   sigurdne
Date:     2016-09-09 06:55:44 +0000 (Fri, 09 Sep 2016)
Log Message:
-----------
Stable: Merge 15631:15635 from trunk

Modified Paths:
--------------
    branches/Version-2_0-branch/controller/inc/class.uicalendar.inc.php

Property Changed:
----------------
    branches/Version-2_0-branch/


Property changes on: branches/Version-2_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/dev-syncromind:13653
/branches/dev-syncromind-2:14937-15027,15165-15215,15223-15228,15230-15243,15245-15250,15254-15257
/branches/stavangerkommune:12743-12875,12986
/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902,14904,14906-14909,14911-14915,14917-14919,14921-14922,14924-14978,14980-15258,15260-15261,15263-15264,15266-15285,15287-15288,15290-15291,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15356,15358,15360-15541,15543-15566,15568-15569,15571,15573-15581,15583,15585-15617,15619,15621-15630
   + /branches/dev-syncromind:13653
/branches/dev-syncromind-2:14937-15027,15165-15215,15223-15228,15230-15243,15245-15250,15254-15257
/branches/stavangerkommune:12743-12875,12986
/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902,14904,14906-14909,14911-14915,14917-14919,14921-14922,14924-14978,14980-15258,15260-15261,15263-15264,15266-15285,15287-15288,15290-15291,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15356,15358,15360-15541,15543-15566,15568-15569,15571,15573-15581,15583,15585-15617,15619,15621-15630,15632-15635

Modified: branches/Version-2_0-branch/controller/inc/class.uicalendar.inc.php
===================================================================
--- branches/Version-2_0-branch/controller/inc/class.uicalendar.inc.php 
2016-09-09 06:54:37 UTC (rev 15635)
+++ branches/Version-2_0-branch/controller/inc/class.uicalendar.inc.php 
2016-09-09 06:55:44 UTC (rev 15636)
@@ -528,6 +528,7 @@
                        $to_date_ts = $this->get_end_date_year_ts($year);
 
                        $locations_with_calendar_array = array();
+                       $locations_location_code = array();
 
 
                        // LOCATIONS: Process aggregated values for controls 
with repeat type day or week
@@ -555,12 +556,13 @@
                                        $year_calendar_agg = new 
year_calendar_agg($control, $year, $curr_location_code, 
"VIEW_LOCATIONS_FOR_CONTROL");
                                        $calendar_array = 
$year_calendar_agg->build_calendar($agg_open_cases_pr_month_array);
 
-                                       $locations_with_calendar_array[] = array
-                                               (
+                                       $locations_with_calendar_array[] = 
array(
                                                'location' => $location,
                                                'calendar_array' => 
$calendar_array,
                                                'selected' => $bookmarks && 
isset($bookmarks[$curr_location_code])
                                        );
+                                       $locations_location_code[] = $location;
+
                                }
 
                                // COMPONENTS: Process aggregated values for 
controls with repeat type day or week
@@ -625,12 +627,12 @@
                                        $year_calendar = new 
year_calendar($control, $year, null, $curr_location_code, "location");
                                        $calendar_array = 
$year_calendar->build_calendar($check_lists_array);
 
-                                       $locations_with_calendar_array[] = array
-                                               (
+                                       $locations_with_calendar_array[] = 
array(
                                                'location' => $location,
                                                'calendar_array' => 
$calendar_array,
                                                'selected' => $bookmarks && 
isset($bookmarks[$curr_location_code])
                                        );
+                                       $locations_location_code[] = $location;
                                }
 
                                foreach ($components_for_control_array as 
$component)
@@ -704,6 +706,7 @@
                        $my_locations = 
$this->get_my_assigned_locations($location_code);
 
                        $heading_array = year_calendar::get_heading_array();
+                       array_multisort($locations_location_code, SORT_ASC, 
$locations_with_calendar_array);
 
                        $data = array
                                (
@@ -801,7 +804,7 @@
                        $to_date_ts = 
month_calendar::get_next_start_date_month_ts($year, intval($month));
 
                        $locations_with_calendar_array = array();
-
+                       $locations_location_code = array();
                        foreach ($locations_for_control_array as $location)
                        {
                                $curr_location_code = 
$location['location_code'];
@@ -823,6 +826,9 @@
                                        'calendar_array' => $calendar_array,
                                        'selected' => $bookmarks && 
isset($bookmarks[$curr_location_code])
                                );
+
+                               $locations_location_code[] = $location;
+
                        }
 
                        foreach ($components_for_control_array as $component)
@@ -893,6 +899,8 @@
 
                        $heading_array = 
month_calendar::get_heading_array($year, $month);
 
+                       array_multisort($locations_location_code, SORT_ASC, 
$locations_with_calendar_array);
+
                        $data = array
                                (
                                'control' => $control->toArray(),