[Noalyss-commit] [noalyss] 94/323: Merge branch 'dev-6919.8'

[Dany De Bontridder]

sparkyx pushed a commit to branch master
in repository noalyss.

commit 4d1117823cea1e990e25437f549af0d60897e890
Merge: 6403e65 0a6a639
Author: Dany De Bontridder <address@hidden>
Date:   Fri Jan 26 23:20:40 2018 +0100

    Merge branch 'dev-6919.8'
    
    Conflicts:
        html/index.php
        html/js/card.js
        html/js/infobulle.js
        include/ajax/ajax_get_profile.php
        include/lib/class_html_input.php
        include/lib/icard.class.php
        include/lib/manage_table_sql.class.php

 html/index.php                         |  2 +-
 html/js/card.js                        |  7 +++++--
 include/constant.php                   |  4 ++--
 include/lib/icard.class.php            | 12 ++++++++++++
 include/lib/manage_table_sql.class.php | 17 +++++++++++++----
 5 files changed, 33 insertions(+), 9 deletions(-)

diff --cc html/index.php
index 558e958,37a7052..d4d23b3
--- a/html/index.php
+++ b/html/index.php
@@@ -175,7 -261,7 +175,7 @@@ if (isset ($_REQUEST['reconnect']) && i
  }
  echo '
  <span 
style="background-color:#879ed4;color:white;padding-left:4px;padding-right:4px;">
- Noalyss NOALYSS_VERSION - '.$my_domain.'
 -version  6919+8 - '.$my_domain.'
++version  NOALYSS_VERSION - '.$my_domain.'
  </span>
  <BR>
  <BR>
diff --cc html/js/card.js
index b744126,c8e7083..396a7a0
--- a/html/js/card.js
+++ b/html/js/card.js
@@@ -722,15 -706,17 +722,18 @@@ function form_blank_card(obj
   */
  function save_card(obj)
  {
-     var content=$(obj).ipopup;
+     if ($(obj)['av_text5']) {
 -        var accounting= $(obj)['av_text5'];
 -        if ( accounting.value.length > 40 ) {
 -          smoke.alert('Poste comptable trop grand');
 -          return false;
 +    var accounting= $(obj)['av_text5'];
 +    if ( accounting && accounting.value.length > 40 ) {
 +      smoke.alert('Poste comptable trop grand');
 +      return false;
 +        }
+         }
+     }
      // Data must be taken here
-     data=$('save_card').serialize(false);
 -    var data=$('save_card').serialize(false); var content=$(obj).ipopup;
 -    $(content).innerHTML=loading();
+ 
++    var    data=$('save_card').serialize(false);
 +    waiting_box();
      var dossier=$('gDossier').value;
      var queryString='gDossier='+dossier;
      queryString+='&ctl='+content;
diff --cc include/constant.php
index 86229d1,06ae994..51a8f0d
--- a/include/constant.php
+++ b/include/constant.php
@@@ -306,11 -306,3 +306,11 @@@ define ("SQL_LIST_UNPAID_INVOICE_DATE_L
   */
  // Limit email exceeds parameter
  define ('EMAIL_LIMIT',1002);
 +define ('EXC_PARAM_VALUE',1005);
 +define ('EXC_PARAM_TYPE',1006);
 +define ('EXC_DUPLICATE',1200);
 +define ('ICONON','icon-on.png');
 +define ('ICONOFF','icon-off.png');
 +define ("PINDG","&#xf047;");
 +define ("UNPINDG","&#xf192;");
- //define ("UNPINDG","&#8778;");
++//define ("UNPINDG","&#8778;");
diff --cc include/lib/icard.class.php
index b228295,42a99c0..b020d6c
--- a/include/lib/icard.class.php
+++ b/include/lib/icard.class.php
@@@ -132,33 -130,27 +132,45 @@@ class ICard extends HtmlInpu
          $this->choice=null;
          $this->indicator=null;
          $this->choice_create=1;
 -      $this->autocomplete=1;
 -        $this->style=' style="vertical-align:50%"';
 +        $this->autocomplete=1;
 +        $this->style='  ';
          $this->accvis=1; //!< account_visible =1 otherwise 0
      }
+     /**
+      * @brief in the search box, the accounting will be hidden
+      */
+     function hide_accounting() {
+         $this->accvis=0;
+     }
+     /**
+      * @brief in the search box, the accounting will be shown it is the 
default
+      */
+     function show_accounting() {
+         $this->accvis=1;
+     }
 -    /*!\brief set the javascript callback function
 +
 +    /**
 +     * @brief in the search box, the accounting will be hidden
 +     */
 +    function hide_accounting()
 +    {
 +        $this->accvis=0;
 +    }
 +
 +    /**
 +     * @brief in the search box, the accounting will be shown it is the 
default
 +     */
 +    function show_accounting()
 +    {
 +        $this->accvis=1;
 +    }
 +
 +    /**\brief set the javascript callback function
       * by default it is update_value called BEFORE the querystring is send
       *
 -     *\param $p_name callback function name
 +     * \param $p_name callback function name
       */
 +
      function set_callback($p_name)
      {
          $this->callback=$p_name;
diff --cc include/lib/manage_table_sql.class.php
index c18ce31,bc8c453..9061fb7
--- a/include/lib/manage_table_sql.class.php
+++ b/include/lib/manage_table_sql.class.php
@@@ -583,8 -429,9 +583,9 @@@ function check(
          if ($this->can_append_row()==TRUE)
          {
              echo HtmlInput::button_action(" "._("Ajout"),
-                     sprintf("%s.input('-1','%s')", $this->object_name,
+                     sprintf("%s.input('-1','%s')", 
 -                            $this->object_name,
 +                            $this->object_name), "xx", "smallbutton", 
BUTTONADD);
+                             $this->object_name),"xx","smallbutton",BUTTONADD);
          }
          $nb_order=count($this->a_order);
          $virg=""; $result="";
@@@ -613,12 -457,12 +614,13 @@@
          echo "</table>";
          if ($this->can_append_row()==TRUE)
          {
 -              echo HtmlInput::button_action(" "._("Ajout"),
 +            echo HtmlInput::button_action(" "._("Ajout"),
-                     sprintf("%s.input('-1','%s')", $this->object_name,
+                     sprintf("%s.input('-1','%s')", 
 -                            $this->object_name,
 +                            $this->object_name), "xx", "smallbutton", 
BUTTONADD);
+                             $this->object_name),"xx","smallbutton",BUTTONADD);
          }
 -        printf ('<script> alternate_row_color("tb%s");</script>', 
$this->object_name);
 +        printf('<script> alternate_row_color("tb%s");</script>',
 +                $this->object_name);
      }
  
      /**
@@@ -939,8 -732,8 +941,8 @@@
              '</li>',
              '</ul>';
              echo "</form>";
- 
+             
 -            
 +
              $html=ob_get_contents();
              ob_end_clean();
  
@@@ -1036,7 -826,7 +1038,14 @@@
       */
      function save()
      {
-         $this->table->save();
 -       $this->table->save();
++        if ($this->table->exist()==0)
++        {
++            $this->table->insert();
++        }
++        else
++        {
++            $this->table->update();
++        }
      }
  
      /**