From 80a8af8e160adf9a60e122994d447ef21d2154d4 Mon Sep 17 00:00:00 2001
From: diego <tematres@r020.com.ar>
Date: Mon, 26 Sep 2022 17:12:53 -0300
Subject: [PATCH] add option in advaced reports to filter terms 'Modified on or
 after'#78

---
 common/include/fun.html_forms.php | 34 +++++++++++++++++++++++--------
 common/include/fun.sql.php        | 12 ++++++-----
 2 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/common/include/fun.html_forms.php b/common/include/fun.html_forms.php
index 3fd3e8cc..e69f4187 100644
--- a/common/include/fun.html_forms.php
+++ b/common/include/fun.html_forms.php
@@ -728,6 +728,10 @@ function HTMLformAdvancedTermReport($array)
     $LABEL_equalThisWord=LABEL_equalThisWord;
     $arrayVocabStats=ARRAYresumen($_SESSION["id_tesa"], "G", "");
 
+    $array_mes=do_intervalDate("1", "12", FORM_LABEL_FechaMes);
+
+    $array_ano=do_intervalDate(date('Y', strtotime($_SESSION["CFGCreacion"])), date("Y"), FORM_LABEL_FechaAno);
+
     $arrayWS=array("t#$LABEL_Termino");
     if ($arrayVocabStats["cant_up"]>0) {
         array_push($arrayWS, "uf#$LABEL_esNoPreferido");
@@ -811,7 +815,7 @@ function HTMLformAdvancedTermReport($array)
   <div class="col-md-4">
     <select id="hasNote" name="hasNote" class="form-control">
 		<option value="">'.ucfirst(LABEL_FORM_nullValue).'</option>
-		'.doSelectForm($arrayNoteType, $_GET["hasNote"]).'
+		'.doSelectForm($arrayNoteType, "").'
     </select>
   </div>
 </div>';
@@ -822,8 +826,22 @@ function HTMLformAdvancedTermReport($array)
   <div class="col-md-3">
     <select id="fromDate" name="fromDate" class="form-control">
 		<option value="">'.ucfirst(LABEL_FORM_nullValue).'</option>
-		'.doSelectForm($formSelectByDate, $_GET["fromDate"]).'    </select>
+		'.doSelectForm(array('create#'.ucfirst(LABEL_DesdeFecha),'mod#'.ucfirst(LABEL_fecha_modificacion)), "").'    </select>
   </div>
+  <div class="form-group col-sm-1">
+        <select class="form-control" id="fromDateMonth" name="fromDateMonth">
+        <optgroup label="'.ucfirst(LABEL_mes).'">
+        '.doSelectForm($array_mes, $fecha_crea["mes"]).'
+        </optgroup>
+        </select>
+  </div>      
+  <div class="form-group col-sm-1">
+        <select class="form-control" id="fromDateYear" name="fromDateYear">
+        <optgroup label="'.ucfirst(LABEL_ano).'">
+        '.doSelectForm($array_ano, $fecha_crea["ano"]).'
+        </optgroup>
+        </select>
+  </div>  
 </div>';
     //target vocabularies
     if ($arrayVocabStats["cant_term2tterm"]) {
@@ -833,12 +851,12 @@ function HTMLformAdvancedTermReport($array)
   <div class="col-md-3">
     <select id="csv_tvocab_id" name="csv_tvocab_id" class="form-control">
 		<option value="">'.ucfirst(LABEL_FORM_nullValue).'</option>
-		'.doSelectForm($array_vocabularios, $_GET["csv_tvocab_id"]).'
+		'.doSelectForm($array_vocabularios, "").'
     </select>
   </div>
   <div class="col-md-3">
     <select id="mapped" name="mapped" class="form-control">
-		'.doSelectForm(array("y#$LABEL_haveEQ","n#$LABEL_nohaveEQ"), $_GET["mapped"]).'
+		'.doSelectForm(array("y#$LABEL_haveEQ","n#$LABEL_nohaveEQ"), "").'
     </select>
   </div>
 </div>';
@@ -850,12 +868,12 @@ function HTMLformAdvancedTermReport($array)
   <div class="col-md-3">
     <select id="csv_itvocab_id" name="csv_itvocab_id" class="form-control">
 		<option value="">'.ucfirst(LABEL_FORM_nullValue).'</option>
-		'.doSelectForm($array_ivocabularios, $_GET["csv_itvocab_id"]).'
+		'.doSelectForm($array_ivocabularios, "").'
     </select>
   </div>
 	<div class="col-md-3">
     <select id="int_mapped" name="int_mapped" class="form-control">
-		'.doSelectForm(array("y#$LABEL_haveEQ","n#$LABEL_nohaveEQ"), $_GET["int_mapped"]).'
+		'.doSelectForm(array("y#$LABEL_haveEQ","n#$LABEL_nohaveEQ"), "").'
     </select>
   </div>
 </div>';
@@ -873,7 +891,7 @@ function HTMLformAdvancedTermReport($array)
 		  <div class="col-md-4">
 		    <select id="user_id" name="byuser_id" class="form-control">
 				<option value="">'.ucfirst(LABEL_FORM_nullValue).'</option>
-				'.doSelectForm($formSelectUsers, $_GET["byuser_id"]).'
+				'.doSelectForm($formSelectUsers, "").'
 		    </select>
 		  </div>
 		</div>';
@@ -883,7 +901,7 @@ function HTMLformAdvancedTermReport($array)
   <label class="col-md-4 control-label" for="w_string">'.ucfirst(LABEL_haveWords).'</label>
   <div class="col-md-3">
     <select id="w_string" name="w_string" class="form-control">
-		'.doSelectForm(array("x#$LABEL_equalThisWord","s#$LABEL_start","e#$LABEL_end"), $_GET["w_string"]).'
+		'.doSelectForm(array("x#$LABEL_equalThisWord","s#$LABEL_start","e#$LABEL_end"), "").'
     </select>
   </div>
 	<div class="col-md-3">
diff --git a/common/include/fun.sql.php b/common/include/fun.sql.php
index 11f8a624..c53c5f68 100644
--- a/common/include/fun.sql.php
+++ b/common/include/fun.sql.php
@@ -2596,13 +2596,15 @@ function SQLadvancedTermReport($array)
 
     // time filter
     // sanitice
-    $arrayDates=explode("-", $array["fromDate"]);
-    $yearDate=secure_data($arrayDates[0], "int");
-    $monthDate=secure_data($arrayDates[1], "int");
+    $yearDate=secure_data($array["fromDateYear"], "int");
+    $monthDate=secure_data($array["fromDateMonth"], "int");
+
+    if (in_array($array["fromDate"], array("create","mod"))) {
+
+        $tag_date= ($array["fromDate"]=='create') ? 't.cuando' : 't.cuando_final';
 
-    if (($yearDate>0) && ($monthDate>0)) {
         $fromDate=$yearDate.'-'.$monthDate.'-01';
-        $where.="        and (t.cuando between '$fromDate' and now())";
+        $where.="        and ($tag_date between '$fromDate' and now())";
     }
     // time update filter
     // and (cuando_final between '2010-05-19' and now())