fmsystem-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Fmsystem-commits] [13938] controller: request_ical_event


From: Sigurd Nes
Subject: [Fmsystem-commits] [13938] controller: request_ical_event
Date: Wed, 16 Sep 2015 16:21:43 +0000

Revision: 13938
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=13938
Author:   sigurdne
Date:     2015-09-16 16:21:42 +0000 (Wed, 16 Sep 2015)
Log Message:
-----------
controller: request_ical_event

Modified Paths:
--------------
    trunk/controller/inc/class.uicheck_list.inc.php
    trunk/controller/inc/class.uicomponent.inc.php
    trunk/controller/setup/phpgw_no.lang
    trunk/controller/templates/base/check_list/add_check_list.xsl
    trunk/controller/templates/base/check_list/edit_check_list.xsl
    trunk/controller/templates/base/component.xsl
    trunk/controller/templates/base/config.tpl

Modified: trunk/controller/inc/class.uicheck_list.inc.php
===================================================================
--- trunk/controller/inc/class.uicheck_list.inc.php     2015-09-16 14:03:04 UTC 
(rev 13937)
+++ trunk/controller/inc/class.uicheck_list.inc.php     2015-09-16 16:21:42 UTC 
(rev 13938)
@@ -369,6 +369,7 @@
                        $config->read();
 
                        $required_actual_hours = 
isset($config->config_data['required_actual_hours']) && 
$config->config_data['required_actual_hours'] ? 
$config->config_data['required_actual_hours'] : false;
+                       $request_ical_event = 
isset($config->config_data['request_ical_event']) && 
$config->config_data['request_ical_event'] ? 
$config->config_data['request_ical_event'] : false;
 
                        $data = array
                        (
@@ -386,7 +387,8 @@
                                'check_list_type' => 'add_check_list',
                                'serie_id'                      => $serie_id,
                                'required_actual_hours' => 
$required_actual_hours,
-                               'integration'                   => 
$this->_get_component_integration($location_id, $component_arr)
+                               'integration'                   => 
$this->_get_component_integration($location_id, $component_arr),
+                               'request_ical_event'    => $request_ical_event
 
                        );
 
@@ -495,6 +497,7 @@
                        $config->read();
 
                        $required_actual_hours = 
isset($config->config_data['required_actual_hours']) && 
$config->config_data['required_actual_hours'] ? 
$config->config_data['required_actual_hours'] : false;
+                       $request_ical_event = 
isset($config->config_data['request_ical_event']) && 
$config->config_data['request_ical_event'] ? 
$config->config_data['request_ical_event'] : false;
 
                        $data = array
                        (
@@ -510,7 +513,8 @@
                                'building_location_code' => 
$building_location_code,
                                'location_level' => $level,
                                'required_actual_hours' => 
$required_actual_hours,
-                               'integration'                   => 
$this->_get_component_integration($location_id, $component_arr)
+                               'integration'                   => 
$this->_get_component_integration($location_id, $component_arr),
+                               'request_ical_event'    => $request_ical_event,
                        );
 
                        $GLOBALS['phpgw']->jqcal->add_listener('planned_date');
@@ -785,7 +789,7 @@
                                /**
                                 * Add an iCal-event if there is a serie - and 
the checklist is visited the first time - or assigned is changed
                                 */
-                               if(($check_list_id && $serie && 
!phpgw::get_var('check_list_id')) || ($serie && $orig_assigned_to != 
$assigned_to) )
+                               if((phpgw::get_var('request_ical_event', 
'bool') && $check_list_id && $serie))// && !phpgw::get_var('check_list_id')) || 
($serie && $orig_assigned_to != $assigned_to) )
                                {
                                        $bocommon= 
CreateObject('property.bocommon');
                                        $current_prefs_user = 
$bocommon->create_preferences('property',$GLOBALS['phpgw_info']['user']['account_id']);

Modified: trunk/controller/inc/class.uicomponent.inc.php
===================================================================
--- trunk/controller/inc/class.uicomponent.inc.php      2015-09-16 14:03:04 UTC 
(rev 13937)
+++ trunk/controller/inc/class.uicomponent.inc.php      2015-09-16 16:21:42 UTC 
(rev 13938)
@@ -514,23 +514,23 @@
                        {
                                $user_id = $user_id * -1;
                                $all_items = false;
-
-                               $keep_only_assigned_to = $user_id;
-                               $assigned_components = 
$so_control->get_assigned_control_components($from_date_ts, $to_date_ts, 
$assigned_to = $user_id);
-                               foreach($assigned_components as $_location_id 
=> $component_list)
-                               {
-                                       $_components = 
execMethod('property.soentity.read',array(
-                                               'filter_entity_group'           
=> $entity_group_id,
-                                               'location_id'                   
        => $_location_id,
-                                               'district_id'                   
        => $district_id,
-                                               'allrows'                       
                => true,
-                                               'filter_item'                   
        => $component_list
-                                               )
-                                       );
-                                       $components = array_merge($components, 
$_components);
-                               }
+                               $user_only = true;
+//                             $keep_only_assigned_to = $user_id;
+//                             $assigned_components = 
$so_control->get_assigned_control_components($from_date_ts, $to_date_ts, 
$assigned_to = $user_id);
+//                             foreach($assigned_components as $_location_id 
=> $component_list)
+//                             {
+//                                     $_components = 
execMethod('property.soentity.read',array(
+//                                             'filter_entity_group'           
=> $entity_group_id,
+//                                             'location_id'                   
        => $_location_id,
+//                                             'district_id'                   
        => $district_id,
+//                                             'allrows'                       
                => true,
+//                                             'filter_item'                   
        => $component_list
+//                                             )
+//                                     );
+//                                     $components = array_merge($components, 
$_components);
+//                             }
                        }
-                       else if(!$location_id)
+                       if(!$location_id)
                        {
                                //nothing
                        }
@@ -684,6 +684,8 @@
 
                                                if($user_only && $user_id)
                                                {
+                                                       $keep_only_assigned_to 
= $user_id;
+
                                                        $found_assigned_to = 
false;
 
                                                        if($calendar_array)

Modified: trunk/controller/setup/phpgw_no.lang
===================================================================
--- trunk/controller/setup/phpgw_no.lang        2015-09-16 14:03:04 UTC (rev 
13937)
+++ trunk/controller/setup/phpgw_no.lang        2015-09-16 16:21:42 UTC (rev 
13938)
@@ -385,4 +385,5 @@
 status components      controller      no      Status komponenter
 controle time  common  no      Kontrolltid
 service time   common  no      Servicetid
-total time     common  no      Totaltid
\ No newline at end of file
+total time     common  no      Totaltid
+request ical event     controller      no      Send M√łteInnkalling
\ No newline at end of file

Modified: trunk/controller/templates/base/check_list/add_check_list.xsl
===================================================================
--- trunk/controller/templates/base/check_list/add_check_list.xsl       
2015-09-16 14:03:04 UTC (rev 13937)
+++ trunk/controller/templates/base/check_list/add_check_list.xsl       
2015-09-16 16:21:42 UTC (rev 13938)
@@ -165,6 +165,20 @@
                                                <xsl:value-of 
select="check_list/billable_hours"/>
                                        </div>
                                </xsl:if>
+                               <xsl:if test="request_ical_event = 1">
+                                       <div class="row">
+                                               <label>
+                                                       <xsl:value-of 
select="php:function('lang', 'request ical event')"/>
+                                               </label>
+                                               <input >
+                                                 <xsl:attribute 
name="id">request_ical_event</xsl:attribute>
+                                                 <xsl:attribute 
name="name">request_ical_event</xsl:attribute>
+                                                 <xsl:attribute 
name="type">checkbox</xsl:attribute>
+                                                 <xsl:attribute 
name="value">1</xsl:attribute>
+                                               </input>
+                                               <xsl:text> </xsl:text>
+                                       </div>
+                               </xsl:if>
 
                                <!-- COMMENT -->
                                <div class="comment">

Modified: trunk/controller/templates/base/check_list/edit_check_list.xsl
===================================================================
--- trunk/controller/templates/base/check_list/edit_check_list.xsl      
2015-09-16 14:03:04 UTC (rev 13937)
+++ trunk/controller/templates/base/check_list/edit_check_list.xsl      
2015-09-16 16:21:42 UTC (rev 13938)
@@ -105,6 +105,20 @@
                                                <xsl:value-of 
select="check_list/billable_hours"/>
                                        </div>
                                </xsl:if>
+                               <xsl:if test="request_ical_event = 1">
+                                       <div class="row">
+                                               <label>
+                                                       <xsl:value-of 
select="php:function('lang', 'request ical event')"/>
+                                               </label>
+                                               <input >
+                                                 <xsl:attribute 
name="id">request_ical_event</xsl:attribute>
+                                                 <xsl:attribute 
name="name">request_ical_event</xsl:attribute>
+                                                 <xsl:attribute 
name="type">checkbox</xsl:attribute>
+                                                 <xsl:attribute 
name="value">1</xsl:attribute>
+                                               </input>
+                                               <xsl:text> </xsl:text>
+                                       </div>
+                               </xsl:if>
                    </fieldset>
                    <fieldset class="col_2">
                            <div class="row">

Modified: trunk/controller/templates/base/component.xsl
===================================================================
--- trunk/controller/templates/base/component.xsl       2015-09-16 14:03:04 UTC 
(rev 13937)
+++ trunk/controller/templates/base/component.xsl       2015-09-16 16:21:42 UTC 
(rev 13938)
@@ -238,10 +238,10 @@
 
                        if(user_id < 0 || custom_frontend ==1)
                        {
-                               $( "#entity_group_id" ).hide();
-                               $("[for='entity_group_id']").hide();
-                               $( "#location_id" ).hide();
-                               $("[for='location_id']").hide();
+//                             $( "#entity_group_id" ).hide();
+//                             $("[for='entity_group_id']").hide();
+//                             $( "#location_id" ).hide();
+//                             $("[for='location_id']").hide();
                                $("[name='all_items']").hide();
                                $("[for='all_items']").hide();
                                $( "#org_unit_id" ).hide();

Modified: trunk/controller/templates/base/config.tpl
===================================================================
--- trunk/controller/templates/base/config.tpl  2015-09-16 14:03:04 UTC (rev 
13937)
+++ trunk/controller/templates/base/config.tpl  2015-09-16 16:21:42 UTC (rev 
13938)
@@ -31,6 +31,15 @@
                                </select>
                        </td>
                </tr>
+               <tr class="row_off">
+                       <td>{lang_request_ical_event}.</td>
+                       <td>
+                               <select name="newsettings[request_ical_event]">
+                                       <option value="" 
{selected_request_ical_event_}>{lang_no}</option>
+                                       <option value="1" 
{selected_request_ical_event_1}>{lang_yes}</option>
+                               </select>
+                       </td>
+               </tr>
                <tr class="row_on">
                        <td>Antall planlagte kontroller som skal vises.</td>
                        <td>




reply via email to

[Prev in Thread] Current Thread [Next in Thread]