erp5_calendar: Make Leave Request more user-friendly in parameterisation and appearance.

Follow a simple / non-simple approach, like for Task and its lines.

In default case, user would need only one Leave Request Period, which can be edited directly on LeaveRequest_view. So, in this case, hide the Listbox containing the Leave Request Periods and have default_leave_request_period being created / edited on background, which will acquire quantity, resource, start_date and stop_date from what is set at the view of the Parent.

In case one or more Leave Request Period are added manually, user would get listbox with sub-objects, and editing should be done directly on them, i.e. fields like my_default_leave_request_period_start_date will be disabled from LeaveRequest_view.

Additionally, now Leave Request has it's own:

• start_date: equal to the minimum start_date of all Leave Request Periods
• stop_date: equal to the maximum stop_date of all Leave Request Periods

These values are set by interaction on Leave Request Period, triggered on _setStartDate, _setStopDate. This helps so that leave_request_module listbox can have sortable dates.

Commit contains also test that should make it easier to understand.

Test results here

@seb we have talked on this and @cedric.leninivin I know you dealt with Leave Requests. Who else should be notified?

bt5/erp5_calendar/PortalTypePropertySheetTemplateItem/property_sheet_list.xml

 <property_sheet_list>
+ <portal_type id="Leave Request">
+  <item>LeaveRequest</item>
+ </portal_type>
  <portal_type id="System Preference">
   <item>CalendarPreference</item>
  </portal_type>

bt5/erp5_calendar/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml

  </chain>
  <chain>
   <type>Leave Request</type>
-  <workflow>edit_workflow, leave_request_workflow</workflow>
+  <workflow>edit_workflow, leave_request_interaction_workflow, leave_request_workflow</workflow>
  </chain>
  <chain>
   <type>Leave Request Period</type>
-  <workflow>edit_workflow</workflow>
+  <workflow>edit_workflow, leave_request_interaction_workflow</workflow>
  </chain>
  <chain>
   <type>Presence Request</type>

bt5/erp5_calendar/PropertySheetTemplateItem/portal_property_sheets/LeaveRequest/leave_request_period_property.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Acquired Property" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>acquisition_accessor_id</string> </key>
+            <value> <string>getLeaveRequestPeriodValue</string> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>acquisition_mask_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_object_id</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>alt_accessor_id</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>categories</string> </key>
+            <value>
+              <tuple>
+                <string>elementary_type/content</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>content_acquired_property_id</string> </key>
+            <value>
+              <tuple>
+                <string>quantity</string>
+                <string>resource</string>
+                <string>start_date</string>
+                <string>stop_date</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>content_portal_type</string> </key>
+            <value> <string>python: (\'Leave Request Period\',)</string> </value>
+        </item>
+        <item>
+            <key> <string>content_translation_acquired_property_id</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string>The default Leave Request Period</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>leave_request_period_property</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Acquired Property</string> </value>
+        </item>
+        <item>
+            <key> <string>storage_id</string> </key>
+            <value> <string>default_leave_request_period</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

bt5/erp5_calendar/PropertySheetTemplateItem/portal_property_sheets/LeaveRequest.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Property Sheet" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_count</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>_mt_index</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>_tree</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>LeaveRequest</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Property Sheet</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="Length" module="BTrees.Length"/>
+    </pickle>
+    <pickle> <int>0</int> </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
+    </pickle>
+    <pickle>
+      <none/>
+    </pickle>
+  </record>
+  <record id="4" aka="AAAAAAAAAAQ=">
+    <pickle>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
+    </pickle>
+    <pickle>
+      <none/>
+    </pickle>
+  </record>
+</ZopeData>

bt5/erp5_calendar/SkinTemplateItem/portal_skins/erp5_calendar/LeaveRequestModule_viewLeaveRequestList/listbox.xml

                           <string>Organisation</string>
                         </tuple>
                         <tuple>
+                          <string>delivery.start_date</string>
+                          <string>Start Date</string>
+                        </tuple>
+                        <tuple>
+                          <string>delivery.stop_date</string>
+                          <string>Stop Date</string>
+                        </tuple>
+                        <tuple>
                           <string>description</string>
                           <string>Description</string>
                         </tuple>

[Sebastien Robin]

@tc should have interest into this since there is already data on Nexedi ERP5. @cedric.leninivin, do you know if there is other instances with really used data ?

[Georgios Dagkakis]

I have no rush, but not to make this MR stale, I would like to merge it early next week if there are no objections. Feel also free to ask more time if someone wants to check but is too busy right now.

[Cédric Le Ninivin]

No objections here

[Cédric Le Ninivin]

I mean, aside from the need to update data in production

[Jérome Perrin]

Looks good, but what data is needed to updated exactly ? setting start/stop date on the leave request ?

[Georgios Dagkakis]

what data is needed to updated exactly ? setting start/stop date on the leave request ?

Yes, something like triggering for all Leave Requests (not tested, inspired from here):

leave_request_period_list = leave_request.objectValues(
  portal_type='Leave Request Period',
)
if leave_request_period_list:
  leave_request.setStartDate(
    min([x.getStartDate() for x in leave_request_period_list])
  )
  leave_request.setStopDate(
    max([x.getStopDate() for x in leave_request_period_list])
  )

And I believe this is so that Data looks good on LeaveRequest_view and leave_request_module Listbox. In what is used for queries no change should be needed.

[Jérome Perrin]

@georgios.dagkakis and I discussed and found two minor problems.

If we consider that it's possible to use periodicity and exceptions to with one leave request and represent things things like " Vacations every Friday afternoon until Christmas, except December 8th" :

then:

• In the case of "simple", there's no listbox, so no link to edit the leave request period to set periodicity and exceptions. For this, we agreed that we can simply tell users that "to do a complex leave request period with periodicity, start by Action ... > Add Leave Request Period and edit the leave request period", then leave request is not "simple" and no problem.
• That's a minor problem, but stop date is not always the max of all the stop dates. Maybe we can use max([x.getStopDate() for x in leave_request_period_list]) + max([x.getPeriodicrityStopDate() for x in leave_request_period_list]).

[ edit: two problems -> two minor problems ]

[Georgios Dagkakis]

For me having periodicity in Leave Request Period is a bit ambiguous. If it is something like Vacations every Friday afternoon until Christmas, except December 8th, and it should start let's say at today, then is it like 5-6 periods. If someone uses it for, say, 6 months, as a user I would prefer to have a separate calendar.

But of course this is just opinion and it ends up to flexibility against usability.

[Georgios Dagkakis]

I just pushed a rebased version. Tests seem to have same problems with master. I plan to merge this early tomorrow morning, unless some objection comes. @jerome 's comments are valid, but as he said not big issues and still this MR is improvement to previous state. Design can be discussed further after.

[Georgios Dagkakis]

I merged. Thank you all for the suggestions