Manage code rewriting

html/js/card.js

@@ -994,7 +994,7 @@ function add_category(obj)
  */
 function save_card_category(obj)
 {
-    if ( ! document.getElementById(obj).ipopup)
+    if ( ! $(obj).ipopup)
     {
         alert_box('Erreur pas d\' attribut ipopup '+obj.id);
         return;
@@ -1010,14 +1010,28 @@ try {
 
     var action=new Ajax.Request ( 'ajax_misc.php',
                             {
-                                  method:'get',
+                                method:'POST',
                                 parameters:queryString,
                                 onFailure:errorFid,
-                                  onSuccess:fill_box
+                                onSuccess:function (req) 
+                                { 
+                                    fill_box(req);
+                                    // populate
+                                     var answer = req.responseXML;
+                                     var a = answer.getElementsByTagName('id');
+                                     var b = answer.getElementsByTagName('name');
+                                     if ( a.length == 1 && b.length == 1) {
+                                         let option=new Element('option');
+                                         option.value=getNodeText(a[0]);
+                                         option.text=getNodeText(b[0]);
+                                         id$('cat').add(option);
+                                     }
+                                }
                               }
                                 );
 	} catch(e)
 	{
+            
 		alert_box(e.message);
 		return false;
 	}

html/js/noalyss_script.js

@@ -2223,7 +2223,7 @@ function filter_table(phrase, _id, colnr, start_row) {
     if (tot_found == 0) {
         if (document.getElementById('info_' + _id)) {
             id$('info_' + _id).innerHTML = content[69];
-            id$('info_' + _id).style.display = 'block';
+            id$('info_' + _id).style.display = 'inline-block';
         }
     } else {
         if (document.getElementById('info_' + _id)) {

include/ajax/ajax_card.php

@@ -634,9 +634,9 @@ case 'scc':
     {
         
         $html="";
-        $nom_mod=$http->get("nom_mod");
+        $nom_mod=$http->post("nom_mod");
-        $class_base=$http->get("class_base");
+        $class_base=$http->post("class_base");
-        $fd_description=$http->get("nom_mod");
+        $fd_description=$http->post("fd_description","string","");
         if ( noalyss_strlentrim($nom_mod) != 0 )
         {
             $array=array("FICHE_REF"=>$cat,
@@ -644,7 +644,7 @@ case 'scc':
                          "class_base"=>$class_base,
                           "fd_description"=>$fd_description);
             
-            if ( isset ($_POST['create'])) $array['create']=1;
+            if ( isset ($_POST['create'])) $array['create']="on";
             
             $catcard=new Fiche_Def($cn);
             
@@ -661,6 +661,14 @@ case 'scc':
             }
             else{
                 $script="alert_box('"._('Catégorie sauvée')."');removeDiv('$ctl')";
+                // add code to update the SELECT in include/template/category_of_card.php
+                $catcard->get();
+               
+                $extra = '<code2>'.
+                        '<id>'.$catcard->id.'</id>'.
+                        '<name>'. escape_xml($catcard->label).'</name>'.
+                        '</code2>';
+                
             }   
                 
             $html.=create_script($script);

include/bank.inc.php

@@ -20,27 +20,26 @@
 /* !\brief include from supplier.inc.php and concerned only the supplier card and
  * the supplier category
  */
-if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis');
+if (!defined('ALLOWED'))
+    die('Appel direct ne sont pas permis');
 global $g_user, $http;
 
 $low_action = $http->request('sb', "string", 'list');
 /* ! \file
  * \brief Called from the module 'Gestion' to manage the supplier
  */
-$href=basename($_SERVER['PHP_SELF']);
+$href=NOALYSS_URL."/do.php";
 
 // by default open liste
 if ($low_action == '')
     $low_action = 'list';
 
 
-//-----------------------------------------------------
+//----------------------------------------new-------------
 // Remove a card
 //-----------------------------------------------------
-if ( isset($_POST['delete_card'] ) )
+if (isset($_POST['delete_card'])) {
-{
+    if ($g_user->check_action(FICADD) == 0) {
-    if ( $g_user->check_action(FICADD) == 0 )
-    {
         alert(_('Vous  ne pouvez pas enlever de fiche'));
         return;
     }
@@ -50,72 +49,37 @@ if ( isset($_POST['delete_card'] ) )
     $fiche = new Bank($cn, $f_id);
     $fiche->remove();
     $low_action = "list";
-
 }
 
 //-----------------------------------------------------
 //    list of supplier
 //-----------------------------------------------------
-if ( $low_action == "list" )
+if ($low_action == "list") {
-{
-
     ?>
     <div class="content">
         <div>
-				 <form method="get" action="<?php echo $href; ?>">
 <?php
-	echo dossier::hidden();
+  Bank::form_search($href, FICHE_TYPE_FIN);
-	echo '<h2 class="h-section">' ._( "Exercice")." " . $g_user->get_exercice() . '</h2>';
-    $a=$http->get("query","string","");
-    echo _("Cherche ").HtmlInput::filter_table_form("tiers_tb", '0,1,2', 1,"query",$a);
-
-     $choice_cat=$http->request("choice_cat", "string",1);
-
-    if ( $choice_cat == 1 )
-    {
-        $sel_card=new ISelect('cat');
-        $sel_card->value=$cn->make_array('select fd_id, fd_label from fiche_def '.
-                                         ' where  frd_id=$1'.
-                                         ' order by fd_label ',1,array(FICHE_TYPE_FIN));
-        $sel_card->selected=$http->get("cat","number",-1);
-        $sel_card->javascript=' onchange="waiting_box();submit(this);"';
-        echo _('Catégorie :').$sel_card->input();
-    }
-    else
-    {
-        $cat=$http->request('cat',"string", '');
-        echo HtmlInput::hidden("cat", $cat);
-        echo HtmlInput::hidden('choice_cat', 0);
-    }
-    $nooperation=new ICheckBox('noop');
-    $nooperation->selected=(isset($_GET['noop']))?true:false;
-    echo _('Inclure les banques sans opération :').$nooperation->input();
-
 ?>
-    <input type="submit" class="button" name="submit_query" value="<?php echo _('recherche')?>">
-                                           <input type="hidden" name="ac" value="<?php echo $http->request('ac')?>">
-                                                                     </form>
         </div>
     <?php
     $supplier = new Bank($cn);
     $search = $http->get("query", "string", "");
     $sql = "";
-    if ( isset($_GET['cat']))
+    if (isset($_GET['cat'])) {
-    {
         $cat = $http->get("cat", "number");
-        if ($cat!= -1 )     $sql = sprintf(" and fd_id = %s", $cat);
+        if ($cat != -1)
+            $sql = sprintf(" and fd_id = %s", $cat);
     }
     $noop = (isset($_GET['noop'])) ? false : true;
 
     echo '<div class="content">';
     echo $supplier->Summary($search, 'bank', $sql, $noop);
 
-
     echo '<br>';
     echo '<br>';
     echo '<br>';
-	if  ($g_user->check_action(FICADD)==1)
+    if ($g_user->check_action(FICADD) == 1) {
-	{
         /* Add button */
         $f_add_button = new IButton('add_card');
         $f_add_button->label = _('Créer une nouvelle fiche');
@@ -128,22 +92,19 @@ if ( $low_action == "list" )
         $f_cat_button = new IButton('add_cat');
         $f_cat_button->set_attribute('type_cat', FICHE_TYPE_FIN);
         $f_cat_button->set_attribute('ipopup', 'ipop_cat');
-		$f_cat_button->label=_('Ajout d\'une catégorie');
+        $f_cat_button->label = _("Ajout d'une catégorie");
         $f_cat_button->javascript = 'add_category(this)';
         echo $f_cat_button->input();
     }
 
     echo '</div>';
     echo '</div>';
-
-
 }
 /* ----------------------------------------------------------------------
  * Detail for a card, Suivi, Contact, Operation,... *
  * cc stands for supplier card
  * ---------------------------------------------------------------------- */
-if ( $low_action == 'detail')
+if ($low_action == 'detail') {
-{
     /* Menu */
     require_once('category_card.inc.php');
     return;

include/class/bank.class.php

@@ -33,11 +33,9 @@ require_once NOALYSS_INCLUDE.'/lib/user_common.php';
 class Bank extends Fiche
 {
 
-    var $name;        /*!< $name name of the company */
+
-    var $street;      /*!< $street Street */
+    
-    var $country;     /*!< $country Country */
+    use Trait_Card; 
-    var $cp;          /*!< $cp Zip code */
-    var $vat_number;  /*!< $vat_number vat number */
     
     /*! \brief Constructor     only a db connection is needed */
     function __construct($p_cn,$p_id=0)

include/class/customer.class.php

@@ -37,7 +37,7 @@ class Customer extends Fiche
     var $country;     /*!<  $country Country */
     var $cp;          /*!<  $cp Zip code */
     var $vat_number;  /*!<  $vat_number vat number */
-
+    use Trait_Card;
     /*! \brief Constructor
     * only a db connection is needed
     */

include/class/fiche_def.class.php

@@ -39,10 +39,10 @@ class Fiche_Def
     var $attribut;		//!< get from attr_xxx tables
     var $fd_description; //!< Description  of the Card Category
 
-    function __construct($p_cn,$p_id = 0)
+    function __construct($cn,$id = 0)
     {
-        $this->cn=$p_cn;
+        $this->cn=$cn;
-        $this->id=$p_id;
+        $this->id=$id;
         
         
     }
@@ -61,7 +61,7 @@ class Fiche_Def
     }
     /**
      * @brief replace by load_attribute
-     * @deprecated since version 9.3.0.12
+     * @deprecated since version 9.3.12
      * @return type
      */
     function getAttribut() {

include/class/manager.class.php

@@ -39,7 +39,7 @@ class Manager extends Fiche
     var $country;     /*!< $country Country */
     var $cp;          /*!< $cp Zip code */
     var $vat_number;  /*!< $vat_number vat number */
-
+    use Trait_Card; 
     /*! \brief Constructor
     * only a db connection is needed */
     function __construct($p_cn,$p_id=0)

include/class/supplier.class.php

@@ -26,7 +26,7 @@ require_once NOALYSS_INCLUDE.'/lib/user_common.php';
  * \brief  class  Supplier are a specific kind of card
  */
 
-// Use the view vw_supplier
+///@brief Use the view vw_supplier and the trait Trait_Card
 //
 class Supplier extends Fiche
 {
@@ -38,6 +38,9 @@ class Supplier extends Fiche
     var $cp;          /*!< $cp Zip code */
     var $vat_number;  /*!< $vat_number vat number */
 
+    use Trait_Card; 
+
+    
     /*! \brief Constructor
     * only a db connection is needed */
     function __construct($p_cn,$p_id=0)

include/class/trait_card.php

@@ -0,0 +1,46 @@
+<?php
+
+/*
+ *   This file is part of NOALYSS.
+ *
+ *   NOALYSS is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   NOALYSS is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with NOALYSS; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+// Copyright Author Dany De Bontridder danydb@aevalys.eu 22/10/23
+
+
+/**
+ * @file
+ * @brief Contains function used by object Customer , Supplier, Bank, ... that
+ * are derivated from Fiche
+ */
+
+/**
+ * @class
+ * @brief Contains function used by object Customer , Supplier, Bank, ... that
+ * are derivated from Fiche
+ */
+trait Trait_Card {
+    /**
+     * @brief For the follow-up module for customer, supplier, ... display a 
+     * filter 
+     * @param $url (string URL) url with folder id, access code ,...
+     * @param $type_card (int) category of card see FICHE_TYPE_* in 
+     * include/constant.php
+     */
+    public static function form_search($url,$type_card)
+    {
+        require_once NOALYSS_TEMPLATE."/trait_card-form_search.php";
+    }
+}

include/constant.php

@@ -368,6 +368,7 @@ define("ARROWUP","⇧");
 // Url of NOALYSS (http://...) 
 // 
 if (!defined("NOALYSS_URL")) {
+    if ( isset ( $_SERVER)) {
     $protocol = "http";
     if (isset ($_SERVER['REQUEST_SCHEME'])) {
         $protocol = $_SERVER['REQUEST_SCHEME'];
@@ -377,6 +378,9 @@ if (!defined("NOALYSS_URL")) {
         ":" . $_SERVER['SERVER_PORT'] .
         dirname($_SERVER['PHP_SELF']);
     define("NOALYSS_URL", $base);
+    }else {
+        define("NOALYSS_URL","command-line");
+    }
 }
 if (!defined("DEFAULT_SERVER_VIDEO_CONF")) {
     define("DEFAULT_SERVER_VIDEO_CONF", "https://www.free-solutions.org/");
@@ -400,6 +404,7 @@ function noalyss_class_autoloader($class)
     }
     
     $aClass = array(
+        "trait_card"=>"class/trait_card.php",
         "database" => "class/database.class.php",
         "acc_detail" => "class/acc_operation.class.php",
         "acc_sold" => "class/acc_operation.class.php",

include/customer.inc.php

@@ -66,38 +66,11 @@ if ($low_action == "list")
     ?>
     <div class="content">
         <div>
-    	<form method="get" action="<?php echo $href;?>">
     	<?php
-            echo '<h2 class="h-section">' . "Exercice " . $g_user->get_exercice() . '</h2>';
-            $a=$http->get("query","string",""); 
-            echo _("Cherche ").HtmlInput::filter_table_form("tiers_tb", '0,1,2', 1,"query",$a);
         
-            $choice_cat=$http->request("choice_cat", "string",1);
+            Customer::form_search($href, FICHE_TYPE_CLIENT);
         
-            if ( $choice_cat == 1 )
-            {
-                $sel_card=new ISelect('cat');
-                $sel_card->value=$cn->make_array('select fd_id, fd_label from fiche_def '.
-                                                 ' where  frd_id='.FICHE_TYPE_CLIENT.
-                                                 ' order by fd_label ',1);
-                $sel_card->selected=$http->get("cat","number",-1);
-                $sel_card->javascript=' onchange="waiting_box();submit(this);"';
-                echo _('Catégorie :').$sel_card->input();
-            } else 
-            {
-                $cat=$http->request('cat',"string", '');
-                echo HtmlInput::hidden("cat",$cat);
-                echo HtmlInput::hidden('choice_cat', 0);
-            }
-            $nooperation = new ICheckBox('noop');
-            $nooperation->selected = (isset($_GET['noop'])) ? true : false;
-            echo Dossier::hidden();
-
-            echo _('Inclure les clients sans opération :') . $nooperation->input();
         ?>
-    	    <input type="submit" class="button" name="submit_query" value="<?php echo  _('recherche')?>">
-    	    <input type="hidden" name="ac" value="<?php echo  $http->request('ac')?>">
-    	</form>
         </div>
 	<?php
 	$client = new Customer($cn);

include/lib/ac_common.php

@@ -1066,7 +1066,6 @@ function find_default_module()
 
 /**
  * @brief show the module
- * @var $g_user
  * @param $module the $_REQUEST['ac'] exploded into an array
  * @param  $idx the index of the array : the AD code is splitted into an array thanks the slash
  */

include/lib/html_input.class.php

@@ -1030,7 +1030,7 @@ class HtmlInput
 			<input type=\"button\" class=\"smallbutton\" onclick=\"$('lk_".$p_table_id."').value='';filter_table($('lk_".$p_table_id."'), '$p_table_id','$p_col',$start_row );\" value=\"X\">
 			</span>
 			";
-        $r.=' <span class="notice" id="info_'.$p_table_id.'"></span>';
+        $r.=' <span class="notice" style="display:none" id="info_'.$p_table_id.'"></span>';
         return $r;
     }
     /**

include/manager.inc.php

@@ -65,38 +65,9 @@ if ($low_action == "list")
     ?>
     <div class="content">
         <div>
-            <form method="get" action="<?php echo $href; ?>">
             <?php
-                echo '<h2 class="h-section">' . "Exercice " . $g_user->get_exercice() . '</h2>';
+              Manager::form_search($href, FICHE_TYPE_EMPL);
-                echo dossier::hidden();
-                $a=$http->get("query","string","");
-                echo _("Cherche ").HtmlInput::filter_table_form("tiers_tb", '0,1,2', 1,"query",$a);
-
-                echo HtmlInput::request_to_hidden(array('ac'));
-                $choice_cat=$http->request("choice_cat", "number",1);
-                if ( $choice_cat == 1 )
-                {
-                    $sel_card = new ISelect('cat');
-                    $sel_card->value = $cn->make_array('select fd_id, fd_label from fiche_def ' .
-                            ' where  frd_id=' . FICHE_TYPE_EMPL .
-                            ' order by fd_label ', 1);
-                    $sel_card->selected=$http->get("cat","number",-1);
-                    $sel_card->javascript = ' onchange="waiting_box();submit(this);"';
-                    echo _('Catégorie :') . $sel_card->input();
-                }
-                else
-                {
-                    $cat=$http->request('cat',"string", '');
-                    echo HtmlInput::hidden("cat",$cat);
-                    echo HtmlInput::hidden('choice_cat', 0);
-                }
-                $nooperation = new ICheckBox('noop');
-                $nooperation->selected = (isset($_GET['noop'])) ? true : false;
-                echo _('Inclure les employés sans opération :') . $nooperation->input();
               ?>
-                <input type="submit" class="button" name="submit_query" value="<?php echo _('recherche') ?>">
-                <input type="hidden" name="ac" value="<?php echo$http->request('ac') ?>">
-            </form>
         </div>
     <?php
     $supplier = new Manager($cn);

include/supplier.inc.php

@@ -20,7 +20,8 @@
 /* !\brief include from supplier.inc.php and concerned only the supplier card and
  * the supplier category
  */
-if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis');
+if (!defined('ALLOWED'))
+    die('Appel direct ne sont pas permis');
 global $g_user, $http;
 
 $low_action = (isset($_REQUEST['sb'])) ? $_REQUEST['sb'] : "list";
@@ -37,12 +38,9 @@ if ( $low_action  == "" )
 //-----------------------------------------------------
 // Remove a card
 //-----------------------------------------------------
-if ( isset($_POST['action_fiche'] ) )
+if (isset($_POST['action_fiche'])) {
-{
+    if ($_POST['action_fiche'] == 'delete_card') {
-    if ( $_POST['action_fiche'] == 'delete_card') 
+        if ($g_user->check_action(FICADD) == 0) {
-    {
-        if ( $g_user->check_action(FICADD) == 0 )
-        {
             alert(_('Vous  ne pouvez pas enlever de fiche'));
             return;
         }
@@ -58,49 +56,19 @@ if ( isset($_POST['action_fiche'] ) )
 //-----------------------------------------------------
 //    list of supplier
 //-----------------------------------------------------
-if ( $low_action == "list" )
+if ($low_action == "list") {
-{
     $search = $http->get("query", "string", "");
-
     ?>
     <div class="content">
         <div>
-                                        <form method="get" action="<?php echo $href; ?>">
         <?php
-	echo '<h2 class="h-section">' . "Exercice " . $g_user->get_exercice() . '</h2>';
+                    Supplier::form_search($href, FICHE_TYPE_FOURNISSEUR);
-	echo dossier::hidden();
-    echo _("Cherche ").HtmlInput::filter_table_form("tiers_tb", '0,1,2', 1,"query",$search);
-
-    $choice_cat=$http->request("choice_cat", "string",1);
-    if ( $choice_cat == 1 )
-    {
-        $sel_card=new ISelect('cat');
-        $sel_card->value=$cn->make_array('select fd_id, fd_label from fiche_def '.
-                                         ' where  frd_id='.FICHE_TYPE_FOURNISSEUR.
-                                         ' order by fd_label ',1);
-        $sel_card->selected=$http->get("cat","number",-1);
-        $sel_card->javascript=' onchange="waiting_box();submit(this);"';
-        echo _('Catégorie :').$sel_card->input();
-    } else 
-    {
-        $cat=$http->request('cat','string', '');
-        echo HtmlInput::hidden("cat",$cat);
-        echo HtmlInput::hidden('choice_cat', 0);
-    }
-    $nooperation=new ICheckBox('noop');
-    $nooperation->selected=(isset($_GET['noop']))?true:false;
-    echo _('Inclure les fournisseurs sans opération :').$nooperation->input();
-
         ?>
-    <input type="submit" class="button" name="submit_query" value="<?php echo _('recherche')?>">
-                                           <input type="hidden" name="ac" value="<?php echo $http->request('ac')?>">
-                                                                     </form>
         </div>
         <?php
         $supplier = new Supplier($cn);
         $sql = "";
-    if (isset($_GET['cat']))
+        if (isset($_GET['cat'])) {
-    {
             $cat = $http->get("cat", "number");
             if ($cat != -1)
                 $sql = sprintf(" and fd_id = %s", $cat);
@@ -110,12 +78,10 @@ if ( $low_action == "list" )
         echo '<div class="content">';
         echo $supplier->Summary($search, 'supplier', $sql, $noop);
 
-
         echo '<br>';
         echo '<br>';
         echo '<br>';
-	if  ($g_user->check_action(FICADD)==1)
+        if ($g_user->check_action(FICADD) == 1) {
-	{
             /* Add button */
             $f_add_button = new IButton('add_card');
             $f_add_button->label = _('Créer une nouvelle fiche');
@@ -135,15 +101,12 @@ if ( $low_action == "list" )
 
         echo '</div>';
         echo '</div>';
-
-
     }
     /* ----------------------------------------------------------------------
      * Detail for a card, Suivi, Contact, Operation,... *
      * cc stands for supplier card
      * ---------------------------------------------------------------------- */
-if ( $low_action == 'detail')
+    if ($low_action == 'detail') {
-{
         /* Menu */
         require_once NOALYSS_INCLUDE . '/category_card.inc.php';
         return;

include/template/trait_card-form_search.php

@@ -0,0 +1,76 @@
+<?php
+/*
+ *   This file is part of NOALYSS.
+ *
+ *   NOALYSS is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   NOALYSS is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with NOALYSS; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+// Copyright Author Dany De Bontridder danydb@aevalys.eu 22/10/23
+
+
+/**
+ * @file
+ * @brief answer to an inplace object
+ */
+// var $g_user \Noalyss_User connected user
+global $g_user;
+// var $type_card = FICHE_TYPE_CLIENT, FICHE_TYPE_FOURNISSEUR,...
+// var $cn Dossier connect to the current folder
+$cn = Dossier::connect();
+
+$http = new HttpInput();
+?>
+<form method="get" action="<?php echo $url; ?>">
+
+    <h2 class="h-section"><?= sprintf("%s %s", _("Exercice"), $g_user->get_exercice()) ?></h2>
+
+    <div style="display:flex">
+        <div>
+<?php
+$a = $http->get("query", "string", "");
+echo _("Cherche ") . HtmlInput::filter_table_form("tiers_tb", '0,1,2', 1, "query", $a);
+
+$choice_cat = $http->request("choice_cat", "string", 1);
+?>
+        </div>
+            <?php
+            if ($choice_cat == 1) {
+                $sel_card = new ISelect('cat');
+                $sel_card->value = $cn->make_array('select fd_id, fd_label from fiche_def 
+                 where  frd_id= $1 
+                 order by fd_label ', 1, [$type_card]);
+                $sel_card->selected = $http->get("cat", "number", -1);
+                $sel_card->javascript = ' onchange="waiting_box();submit(this);"';
+                echo '<div>';
+                echo _('Catégorie :') . $sel_card->input();
+                echo '</div>';
+            } else {
+                $cat = $http->request('cat', "string", '');
+                echo HtmlInput::hidden("cat", $cat);
+                echo HtmlInput::hidden('choice_cat', 0);
+            }
+            $nooperation = new ICheckBox('noop');
+            $nooperation->selected = (isset($_GET['noop'])) ? true : false;
+            echo Dossier::hidden();
+            ?>
+        <div>
+        <?= _('Inclure ceux sans opération cette année') . $nooperation->input() ?>
+        </div>
+        <div>
+            <input type="submit" class="button" name="submit_query" value="<?php echo _('recherche') ?>">
+            <input type="hidden" name="ac" value="<?php echo $http->request('ac') ?>">
+        </div>
+    </div>
+</form>
+