[Noalyss-commit] [noalyss] 171/323: History based on the date of the operation which it comes from

[Dany De Bontridder]

sparkyx pushed a commit to branch master
in repository noalyss.

commit 7469eb7044df658bfa3381304e0e51af1a1f2a99
Author: Dany De Bontridder <address@hidden>
Date:   Sat Feb 10 09:45:06 2018 +0100

    History based on the date of the operation which it comes from
---
 html/popup.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/html/popup.php b/html/popup.php
index 5bed031..8118411 100644
--- a/html/popup.php
+++ b/html/popup.php
@@ -24,10 +24,11 @@ require_once NOALYSS_INCLUDE.'/lib/html_input.class.php';
 require_once NOALYSS_INCLUDE.'/lib/icon_action.class.php';
 require_once NOALYSS_INCLUDE.'/class/dossier.class.php';
 require_once NOALYSS_INCLUDE.'/lib/database.class.php';
+require_once NOALYSS_INCLUDE.'/lib/http_input.class.php';
 require_once NOALYSS_INCLUDE.'/class/user.class.php';
 require_once NOALYSS_INCLUDE.'/class/periode.class.php';
 
-
+$http=new HttpInput();
 /*
  * Check if the user is still connected
  */
@@ -66,8 +67,13 @@ $g_user->check_dossier(Dossier::id());
 if ( basename($_GET['op']) == 'history' )
   {
     $href=dossier::get();
+    
+    $exercice=$http->get("exercice","number",0);
+    
     /* current year  */
-    $exercice=$g_user->get_exercice();
+    if ($exercice == 0 ) {
+        $exercice=$g_user->get_exercice();
+    }
 
     /* get date limit */
     $periode=new Periode($cn);