Merge branch '5908-date-field-should-have-a-start-date-parameter' into '1.4-dev'

Resolve "Date field should have a start date parameter"

See merge request fusiondirectory/fd!422

html/include/datepicker.js

@@ -8,6 +8,10 @@
  *  Modified 10.06.2008
  * by Manu <manu@bytefresser.de>
  *
+ *  Modified 15.10.2018
+ * by FusionDirectory Project
+ *  -> Add defaultDate/_default_date
+ *
  */
 
 /**
@@ -200,6 +204,7 @@ DatePicker.prototype  = {
   _disablePastDate    : false,
   _disableFutureDate  : false,
   _oneDayInMs       : 24 * 3600 * 1000,
+  _default_date     : null,
 
   /* positionning */
   _topOffset        : 20,
@@ -240,7 +245,10 @@ DatePicker.prototype  = {
 
     if (! this._df.match(this._current_date)) {
 
-      this._current_date = this._df.current_date();
+      if (this._default_date != null) {
+        this._current_date = this._default_date;
+      } else
+        this._current_date = this._df.current_date();
 
       /* set the field value ? */
       if (!this._keepFieldEmpty)
@@ -292,6 +300,8 @@ DatePicker.prototype  = {
       this._externalControl = h_p["externalControl"];
     if (!Object.isUndefined(h_p["dateFormat"]))
       this._dateFormat = h_p["dateFormat"];
+    if (!Object.isUndefined(h_p["defaultDate"]))
+      this._default_date = h_p["defaultDate"];
     if (Object.isFunction(h_p["cellCallback"]))
       this._cellCallback = h_p["cellCallback"];
     if (!Object.isUndefined(h_p["enableCloseOnBlur"]) && h_p["enableCloseOnBlur"])

include/simpleplugin/attributes/class_DateAttribute.inc

 <?php
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
-  Copyright (C) 2012-2016  FusionDirectory
+  Copyright (C) 2012-2018  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -25,6 +25,7 @@
 class DateAttribute extends Attribute
 {
   protected $format;
+  protected $defaultDate;
 
   /*! \brief The constructor of DateAttribute
    *
@@ -34,12 +35,22 @@ class DateAttribute extends Attribute
    *  \param boolean $required Is this attribute mandatory or not
    *  \param string $format The date format. It can be any format recognized by DateTime::format. see http://www.php.net/manual/fr/function.date.php
    *  \param mixed $defaultValue The default value for this attribute
+   *  \param mixed $defaultDate The default date for the date picker when attribute is empty
    *  \param string $acl The name of the acl for this attribute if he does not use its own. (Leave empty if he should use its own like most attributes do)
    */
-  function __construct ($label, $description, $ldapName, $required, $format, $defaultValue = 'now', $acl = "")
+  function __construct ($label, $description, $ldapName, $required, $format, $defaultValue = 'now', $defaultDate = NULL, $acl = '')
   {
     parent::__construct($label, $description, $ldapName, $required, $defaultValue, $acl);
     $this->format = $format;
+    if ($defaultDate !== NULL) {
+      try {
+        $date = new DateTime($defaultDate, new DateTimeZone('UTC'));
+        $defaultDate = $date->format('d.m.Y');
+      } catch (Exception $e) {
+        $defaultDate = NULL;
+      }
+    }
+    $this->defaultDate = $defaultDate;
   }
 
   function inputValue ($value)
@@ -62,11 +73,7 @@ class DateAttribute extends Attribute
       try {
         return $this->getDateValue()->format('d.m.Y');
       } catch (Exception $e) {
-        if ($this->isTemplate() && preg_match('/%/', $this->value)) {
-          return $this->value;
-        } else {
-          return '';
-        }
+        return $this->value;
       }
     }
   }
@@ -77,8 +84,7 @@ class DateAttribute extends Attribute
     if ($date !== FALSE) {
       return $date;
     } else {
-      trigger_error('LDAP value for '.$this->getLdapName().' was not in the right date format.');
-      return new DateTime($ldapValue, new DateTimeZone('UTC'));
+      return $ldapValue;
     }
   }
 
@@ -104,11 +110,7 @@ class DateAttribute extends Attribute
       try {
         $this->setValue($this->getDateValue());
       } catch (Exception $e) {
-        if ($this->isTemplate() && preg_match('/%/', $this->value)) {
-          return $this->value;
-        } else {
-          throw $e;
-        }
+        return $this->value;
       }
     }
     return $this->dateToLdap($this->value);
@@ -151,7 +153,16 @@ class DateAttribute extends Attribute
     $display  .= '{if $'.$this->getAcl().'ACL|regex_replace:"/[cdmr]/":"" == "w"}'.
         '<script type="text/javascript">
           {literal}
-          var datepicker  = new DatePicker({ relative : \''.$id.'\', language : \'{/literal}{$lang}{literal}\', keepFieldEmpty : true, enableCloseEffect : false, enableShowEffect : false });
+          var datepicker  = new DatePicker('.
+            '{ '.
+              'relative : \''.$id.'\', '.
+              (($this->defaultDate !== NULL) ? 'defaultDate : \''.$this->defaultDate.'\', ' : '').
+              'language : \'{/literal}{$lang}{literal}\', '.
+              'keepFieldEmpty : true, '.
+              'enableCloseEffect : false, '.
+              'enableShowEffect : false '.
+            '}'.
+          ');
           {/literal}
         </script>
         {/if}';
@@ -164,9 +175,9 @@ class DateAttribute extends Attribute
  */
 class GeneralizedTimeDateAttribute extends DateAttribute
 {
-  function __construct ($label, $description, $ldapName, $required, $defaultValue = 'now', $acl = "")
+  function __construct ($label, $description, $ldapName, $required, $defaultValue = 'now', $defaultDate = NULL, $acl = '')
   {
-    parent::__construct($label, $description, $ldapName, $required, '', $defaultValue, $acl);
+    parent::__construct($label, $description, $ldapName, $required, '', $defaultValue, $defaultDate, $acl);
   }
 
   protected function ldapToDate($ldapValue)
@@ -174,8 +185,7 @@ class GeneralizedTimeDateAttribute extends DateAttribute
     try {
       return LdapGeneralizedTime::fromString($ldapValue);
     } catch (LdapGeneralizedTimeBadFormatException $e) {
-      trigger_error('LDAP value "'.$ldapValue.'" for '.$this->getLdapName().' is not in the right date format.');
-      return new DateTime($ldapValue, timezone::utc());
+      return $ldapValue;
     }
   }