From: Kilian Saffran <ksaffran@dks.lu>
Date: Sat, 10 Aug 2019 09:58:51 +0000 (+0200)
Subject: billjee un-publish done
X-Git-Url: http://cloud.dks.lu/git/?a=commitdiff_plain;h=46585b3f90a0c76f4000d5a396ca5b21d89332d2;p=juridig_lu.git

billjee un-publish done
---

diff --git a/backoffice/api/process.cgi b/backoffice/api/process.cgi
index d7c07f7..1f74f4b 100644
--- a/backoffice/api/process.cgi
+++ b/backoffice/api/process.cgi
@@ -264,7 +264,7 @@ if (($cgi->request_method() eq "GET") || ($cgi->request_method() eq "POST")){
     # }
     elsif($p->{fn} eq "getmonthbilljees"){
       
-      my $sql = "select eventdate,count(*) from billjeetickets where eventdate between date('".$p->{startdate}."') and date(date('".$p->{startdate}."') + interval '41 days') and isdisabled is null group by eventdate order by eventdate;";
+      my $sql = "select eventdate,count(*) from billjeetickets where eventdate between date('".$p->{startdate}."') and date(date('".$p->{startdate}."') + interval '41 days') and isdisabled is null and id_user != '".$sess->{id}."' group by eventdate order by eventdate;";
       my $res = $db->dbquerybykey("eventdate",$sql);
       $html->{result}->{events} = $res;
     } 
@@ -304,7 +304,7 @@ where bt.eventdate between date('".$p->{startdate}."') and date('".$p->{enddate}
     }
     elsif($p->{fn} eq "getbilljeeeventsbyuser"){
       #ownevents
-      my $sql ="select bt.id,bt.id_user,bt.isdisabled,bt.court,bt.room,to_char(bt.eventdate,'DD.MM.YYYY') as dspdate,bt.dayperiod,bt.eventmsg as msg ,bt.eventtype,us.prename,us.surname 
+      my $sql ="select bt.id,bt.id_user,bt.isdisabled,bt.court,bt.room,to_char(bt.eventdate,'DD.MM.YYYY') as dspdate,bt.dayperiod,bt.eventmsg as msg ,bt.eventtype,case when bt.eventtype ='offer' then 'offre' else 'demande' end as dspeventtype,us.prename,us.surname 
 from billjeetickets  bt 
 join billjee bj on (bj.id_user=bt.id_user)
 join (select users.id,users.prename,users.surname,appaccess.privateenabled from users join appaccess on (appaccess.id_user=users.id) and appaccess.id_app=7) us on (bt.id_user=us.id)
@@ -315,14 +315,15 @@ where bt.eventdate between date('".$p->{startdate}."') and date('".$p->{enddate}
        $html->{result}->{events} = $res;
     }
     elsif($p->{fn} eq "billjeepublishevent"){
-      my $sql = "UPDATE billjeetickets set isdisabled=null where id=".$p->{id}." and id_user=".$sess->{id}.";";
-      $db->dbexec($sql);
-      $html->{result}->{publish} = "ok";
-    }
-    elsif($p->{fn} eq "billjeeunpublishevent"){
+      $html->{result}->{id} = $p->{id};
       my $sql = "UPDATE billjeetickets set isdisabled=true where id=".$p->{id}." and id_user=".$sess->{id}.";";
+      $html->{result}->{isdisabled} = 1;
+      if ($p->{isdisabled} eq "1"){
+        $sql = "UPDATE billjeetickets set isdisabled=null where id=".$p->{id}." and id_user=".$sess->{id}.";";
+        $html->{result}->{isdisabled} ="";
+      }
+     # $html->{result}->{sql} = $sql;
       $db->dbexec($sql);
-      $html->{result}->{unpublish} = $p->{id};
     }
   }
   
diff --git a/backoffice/tmpl/block/dlgpublish.tt b/backoffice/tmpl/block/dlgpublish.tt
index 3051cc0..b38813d 100644
--- a/backoffice/tmpl/block/dlgpublish.tt
+++ b/backoffice/tmpl/block/dlgpublish.tt
@@ -3,7 +3,7 @@
     <header class="w3-container"> 
       <span onclick="document.getElementById('dlgpublish').style.display='none'; return false;" 
       class="w3-button w3-display-topright">&times;</span>
-      <h2>Êtes-vous sûre de publier ce billjee?</h2>
+      <h2 id="dlgpublish_title">MSG</h2>
     </header>
     <div class="w3-container" id="dlgpublish_details">
       
@@ -16,26 +16,40 @@
   </div>
 </div>
 <script>
+var dlgstates={ "publish":{"msg":"Êtes-vous sûre de publier ce billjee?","btn":'<img src="[% abspath %]images/icons/unpublish.svg" style="width: 24px;" />&nbsp;Enlever '},
+  "unpublish":{"msg":"Êtes-vous sûre d'enlever ce billjee?","btn":'<img src="[% abspath %]images/icons/publish.svg" style="width: 24px;" />&nbsp;Publier '}
+}
+var cpublstate = null;
 function publish_event(id){
   document.getElementById('dlgpublish_event_id').value= id;
-  document.getElementById('dlgpublish_details').innerHTML = '';
+  cpublstate = document.getElementById('btnpublish_'+ id).dataset.isdisabled;
+  if (cpublstate == "1"){
+    document.getElementById('dlgpublish_title').innerHTML =  dlgstates.publish.msg;
+  } else {
+    document.getElementById('dlgpublish_title').innerHTML =  dlgstates.unpublish.msg;
+  }
+  
+  document.getElementById('dlgpublish_details').innerHTML = document.getElementById('event_' + id + '_info1').innerHTML + '<br/>' + document.getElementById('event_' + id + '_info2').innerHTML;
   document.getElementById('dlgpublish').style.display='block';
   return false;
 }
 
 function send_publish_event(){
   var evtid = document.getElementById('dlgpublish_event_id').value;
-  document.getElementById('dlgpublish_details').innerHTML = '';
-  req.reqdata("POST","process.cgi",{"fn":"billjeepublishevent","id":evtid},publish_result);
+
+  req.reqdata("POST","process.cgi",{"fn":"billjeepublishevent","id":evtid,"isdisabled":cpublstate},publish_result);
+  document.getElementById('dlgpublish').style.display='none';
   return false;
 }
 
 function publish_result(data){
-  if (document.getElementById("btnunpublish_" + data.result.unpublish)){
-    document.getElementById("btnunpublish_" + data.result.unpublish).style.display = 'block';
-    document.getElementById("btnpublish_" + data.result.unpublish).style.display = 'none';
+  
+  if (data.isdisabled == 1){
+    document.getElementById('btnpublish_'+ data.id).innerHTML = dlgstates.unpublish.btn;
+    document.getElementById('btnpublish_'+ data.id).dataset.isdisabled = 1;
   } else {
-    document.getElementById("event_" + data.result.unpublish).remove;
+    document.getElementById('btnpublish_'+ data.id).innerHTML = dlgstates.publish.btn;
+    document.getElementById('btnpublish_'+ data.id).dataset.isdisabled = '';
   }
   return false;
 }
diff --git a/backoffice/tmpl/block/dlgunpublish.tt b/backoffice/tmpl/block/dlgunpublish.tt
deleted file mode 100644
index 222d1ba..0000000
--- a/backoffice/tmpl/block/dlgunpublish.tt
+++ /dev/null
@@ -1,44 +0,0 @@
-<div id="dlgunpublish" class="w3-modal">
-  <div class="w3-modal-content w3-animate-top w3-card-4">
-    <header class="w3-container"> 
-      <span onclick="document.getElementById('dlgunpublish').style.display='none';" 
-      class="w3-button w3-display-topright">&times;</span>
-      <h2>Êtes-vous sûre d'enlever ce billjee?</h2>
-    </header>
-    <div class="w3-container" id="dlgunpublish_details">
-      
-    </div>
-    <footer class="w3-container w3-right-align w3-padding-16">
-      <input type="hidden" value="" id="dlgunpublish_event_id" />
-      <button class="w3-button w3-theme-light w3-margin-right w3-border" onclick="document.getElementById('dlgunpublish').style.display='none';">Non</button>
-      <button class="w3-button w3-theme-l2 w3-margin-right w3-border" onclick="send_unpublish_event();">Oui</button>
-    </footer>
-  </div>
-</div>
-<script>
-function unpublish_event(id){
-  console.log("TEST");
-  document.getElementById('dlgunpublish_event_id').value= id;
-  document.getElementById('dlgunpublish_details').innerHTML = '';
-  document.getElementById('dlgunpublish').style.display='block';
-  return false;
-}
-
-function send_unpublish_event(){
-  var evtid = document.getElementById('dlgunpublish_event_id').value;
-  document.getElementById('dlgunpublish_details').innerHTML = '';
-  req.reqdata("POST","process.cgi",{"fn":"billjeeunpublishevent","id":evtid},null);
-  //document.getElementById('event_' + evtid).remove;
-  return false;
-}
-
-function unpublish_result(data){
-  if (document.getElementById("btnpublish_" + data.result.unpublish)){
-    document.getElementById("btnunpublish_" + data.result.unpublish).style.display = 'none';
-    document.getElementById("btnpublish_" + data.result.unpublish).style.display = 'block';
-  } else {
-    document.getElementById("event_" + data.result.unpublish).remove;
-  }
-  return false;
-}
-</script>
\ No newline at end of file
diff --git a/backoffice/tmpl/module/billjee/index.js b/backoffice/tmpl/module/billjee/index.js
index 6a8911b..919a97e 100644
--- a/backoffice/tmpl/module/billjee/index.js
+++ b/backoffice/tmpl/module/billjee/index.js
@@ -15,8 +15,6 @@ function initpage(){
  
 }
 
-
-
 function search_data(){
   //document.getElementById('pnlresult').innerHTML = '';
   var start = document.getElementById("filterdatefrom").value;
@@ -36,17 +34,7 @@ function display_results(data){
     '</div><div class="w3-container w3-theme-d4"><h5 id="event_'+data.events[i].id+'_info2">' + courts[data.events[i].court] + ((data.events[i].room)?' (' + data.events[i].room + ')':'') + '</h5>'+'</div>';
     card += '<div class="w3-container">' + data.events[i].msg + '</div>';
     card += '<footer class="w3-container w3-right-align w3-padding-16">';
-    if (userid == data.events[i].id_user){
-      card += '<button class="w3-btn w3-theme-l2 w3-margin-right" onclick="edit_event(\''+ data.events[i].id +'\');"><img src="[% abspath %]images/icons/edit.svg" style="width: 24px;" data-id="\''+ data.events[i].id +'\'"/>&nbsp;Editer </button>';
-      //if (data.events.isdisabled)
-      //card += '<button class="w3-btn w3-theme-l2 w3-margin-right" ><img src="[% abspath %]images/icons/publish.svg" style="width: 24px;" />&nbsp;Publier </button>';
-      card += '<button class="w3-btn w3-theme-l2 w3-margin-right" id="btnunpublish_'+data.events[i].id+'" onclick="unpublish_event(\''+ data.events[i].id +'\');"><img src="[% abspath %]images/icons/unpublish.svg"  style="width: 24px;" />&nbsp;Enlever </button>';
-      card += '<button class="w3-btn w3-red w3-text-black" ><img src="[% abspath %]images/icons/remove.svg" onclick="delete_event();" style="width: 24px;" />&nbsp;Supprimer </button>';
-    } else {
-      card += '<button class=" w3-btn w3-theme-l2 w3-margin-right" onclick="contact_publisher(\''+ data.events[i].id +'\');"><img src="[% abspath %]images/icons/send.svg"  style="width: 24px;" />&nbsp;Contacter </button>';
-    }
-//     
-
+    card += '<button class=" w3-btn w3-theme-l2 w3-margin-right" onclick="contact_publisher(\''+ data.events[i].id +'\');"><img src="[% abspath %]images/icons/send.svg"  style="width: 24px;" />&nbsp;Contacter </button>';
     card += '</footer>';
     card += '</div>';
     res.innerHTML = res.innerHTML +  card;
diff --git a/backoffice/tmpl/module/billjee/index.tt b/backoffice/tmpl/module/billjee/index.tt
index 9500382..602b8a6 100644
--- a/backoffice/tmpl/module/billjee/index.tt
+++ b/backoffice/tmpl/module/billjee/index.tt
@@ -53,8 +53,6 @@
     </div>
 </div> 
 </div>
-[% INCLUDE block/dlgdelete.tt %]
-[% INCLUDE block/dlgunpublish.tt %]
 [% INCLUDE block/dlgcontactpublisher.tt %]
 
 
diff --git a/backoffice/tmpl/module/billjee/mytickets.js b/backoffice/tmpl/module/billjee/mytickets.js
index cbb3d2f..944cdf3 100644
--- a/backoffice/tmpl/module/billjee/mytickets.js
+++ b/backoffice/tmpl/module/billjee/mytickets.js
@@ -40,10 +40,16 @@ function display_results(data){
       card += '<button class="w3-btn w3-theme-l2 w3-margin-right" onclick="edit_event(\''+ data.events[i].id +'\');"><img src="[% abspath %]images/icons/edit.svg" style="width: 24px;" data-id="\''+ data.events[i].id +'\'"/>&nbsp;Editer </button>';
       //if (data.events.isdisabled)
       //card += '<button class="w3-btn w3-theme-l2 w3-margin-right" ><img src="[% abspath %]images/icons/publish.svg" style="width: 24px;" />&nbsp;Publier </button>';
+      console.log("Dis: " + data.events[i].isdisabled) ;
        
-       
-      card += '<button class="w3-btn w3-theme-l2 w3-margin-right" id="btnpublish_'+data.events[i].id+'" onclick="publish_event(\''+ data.events[i].id +'\');"><img src="[% abspath %]images/icons/publish.svg"  style="width: 24px;'+ ((data.events[i].isdisabled)? 'display:none;':'') +'" />&nbsp;Publier </button>';
-      card += '<button class="w3-btn w3-theme-l2 w3-margin-right" id="btnunpublish_'+data.events[i].id+'" onclick="unpublish_event(\''+ data.events[i].id +'\');"><img src="[% abspath %]images/icons/unpublish.svg"  style="width: 24px;'+ ((data.events[i].isdisabled)? '':'display:none') +'" />&nbsp;Enlever </button>';
+      card += '<button class="w3-btn w3-theme-l2 w3-margin-right" id="btnpublish_'+data.events[i].id+'" data-isdisabled="'+ ((data.events[i].isdisabled == 1)?1:'') + '" onclick="publish_event(\''+ data.events[i].id +'\');">';
+      if (data.events[i].isdisabled == "1"){
+        card += dlgstates.unpublish.btn;
+      } else {
+        card += dlgstates.publish.btn;
+      }
+      
+      card += '</button>';
       card += '<button class="w3-btn w3-red w3-text-black" ><img src="[% abspath %]images/icons/remove.svg" onclick="delete_event();" style="width: 24px;" />&nbsp;Supprimer </button>';
     } else {
       card += '<button class=" w3-btn w3-theme-l2 w3-margin-right" onclick="contact_publisher(\''+ data.events[i].id +'\');"><img src="[% abspath %]images/icons/send.svg"  style="width: 24px;" />&nbsp;Contacter </button>';
diff --git a/backoffice/tmpl/module/billjee/mytickets.tt b/backoffice/tmpl/module/billjee/mytickets.tt
index de57143..c83c0a9 100644
--- a/backoffice/tmpl/module/billjee/mytickets.tt
+++ b/backoffice/tmpl/module/billjee/mytickets.tt
@@ -21,5 +21,4 @@
 </div> 
 </div>
 [% INCLUDE block/dlgdelete.tt %]
-[% INCLUDE block/dlgunpublish.tt %]
 [% INCLUDE block/dlgpublish.tt %]
\ No newline at end of file