From: Kilian Saffran <ksaffran@dks.lu>
Date: Sat, 10 Aug 2019 11:20:43 +0000 (+0200)
Subject: delete billjee
X-Git-Url: http://cloud.dks.lu/git/?a=commitdiff_plain;h=ec27bba72802e579ce816fa48e245f6fe85e3257;p=juridig_lu.git

delete billjee
---

diff --git a/backoffice/api/process.cgi b/backoffice/api/process.cgi
index 1f74f4b..d87d8f9 100644
--- a/backoffice/api/process.cgi
+++ b/backoffice/api/process.cgi
@@ -325,6 +325,13 @@ where bt.eventdate between date('".$p->{startdate}."') and date('".$p->{enddate}
      # $html->{result}->{sql} = $sql;
       $db->dbexec($sql);
     }
+    elsif($p->{fn} eq "deletebilljee"){
+      $html->{result}->{id} = $p->{id};
+      my $sql = "DELETE FROM  billjeebooking where id_billjeeticket=".$p->{id}.";";
+      $db->dbexec($sql);
+      $sql = "DELETE FROM  billjeetickets where id=".$p->{id}." and id_user=".$sess->{id}.";";
+      $db->dbexec($sql);
+    }
   }
   
 }
diff --git a/backoffice/tmpl/block/dlgdelete.tt b/backoffice/tmpl/block/dlgdelete.tt
index c2c2a8a..a6e51bb 100644
--- a/backoffice/tmpl/block/dlgdelete.tt
+++ b/backoffice/tmpl/block/dlgdelete.tt
@@ -20,17 +20,26 @@ function delete_event(id){
   //console.log("delete event " + id);
   //
   document.getElementById('dlgdelete_event_id').value= id;
-  document.getElementById('dlgdelete_details').innerHTML = '';
+  document.getElementById('dlgdelete_details').innerHTML = document.getElementById('event_' + id + '_info1').innerHTML + '<br/>' + document.getElementById('event_' + id + '_info2').innerHTML;;
   document.getElementById('dlgdelete').style.display='block';
   return false;
 }
 
 function send_delete_event(){
-  console.log("really delete event " + id);
+  //console.log("really delete event " + id);
   var evtid = document.getElementById('dlgdelete_event_id').value;
   document.getElementById('dlgdelete_details').innerHTML = '';
-  //req.reqdata("POST","process.cgi",{"fn":"deleteevent","id":evtid},null);
-  document.getElementById('event_' + evtid).remove;
+  
+  req.reqdata("POST","process.cgi",{"fn":"deletebilljee","id":evtid},event_deleted);
+  document.getElementById('dlgdelete').style.display='none';
+  
+  
+}
+
+function event_deleted(data){
+  if (data.id){
+    document.getElementById('event_' + data.id).remove;
+  }
   
 }
 </script>
\ No newline at end of file
diff --git a/backoffice/tmpl/module/billjee/form_billet.tt b/backoffice/tmpl/module/billjee/form_billet.tt
index f01d72a..037dc92 100644
--- a/backoffice/tmpl/module/billjee/form_billet.tt
+++ b/backoffice/tmpl/module/billjee/form_billet.tt
@@ -9,7 +9,13 @@ join (select users.id,users.prename,users.surname,appaccess.privateenabled from
 where bt.id = ? group by bt.id,binv.invites;") %]
   [% rbill = qbill.execute(params.id) %]
   [% bill = rbill.get_first(); %]
-
+[% ELSE %]
+[% qbill = dksdb.prepare("select null as id,bj.id_user, null as court, null as room, CURRENT_DATE as eventdate, null as dayperiod,
+null as eventmsg,  null as eventtype,  binv.invites FROM billjee bj 
+ left join (select id,string_agg(invites,',') as invites from (select id,json_array_elements_text(invites) as invites from billjee ) as x group by id ) binv on (bj.id=binv.id)
+ where bj.id_user= ?;") %]
+[% rbill = qbill.execute(session.id) %]
+  [% bill = rbill.get_first(); %]
 [% END %]
 <div class="w3-display-container" >
       
diff --git a/backoffice/tmpl/module/billjee/mytickets.js b/backoffice/tmpl/module/billjee/mytickets.js
index 944cdf3..d3ae76b 100644
--- a/backoffice/tmpl/module/billjee/mytickets.js
+++ b/backoffice/tmpl/module/billjee/mytickets.js
@@ -36,7 +36,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>';
@@ -50,11 +50,7 @@ function display_results(data){
       }
       
       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>';
-    }
-//     
+      card += '<button class="w3-btn w3-red w3-text-black"  onclick="delete_event(\''+ data.events[i].id +'\');"><img src="[% abspath %]images/icons/remove.svg" style="width: 24px;" />&nbsp;Supprimer </button>';
 
     card += '</footer>';
     card += '</div>';
diff --git a/img/user-plus.svg b/img/user-plus.svg
new file mode 100644
index 0000000..e1e14a7
--- /dev/null
+++ b/img/user-plus.svg
@@ -0,0 +1,3 @@
+<svg id="glyphicons-basic" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
+  <path id="user-plus" d="M9.36481,13.37427A1.2749,1.2749,0,0,1,10,11.62988V9c0-3,2-5,5.5-5a6.79133,6.79133,0,0,1,2.64575.50122,7.94842,7.94842,0,0,0,3.59918,8.26123,1.71227,1.71227,0,0,1-.10974.61182l-.28.75146a2.99115,2.99115,0,0,1-1.31073,1.462l-.66583,3.05176A2.99994,2.99994,0,0,1,16.44763,21H14.55237a2.99994,2.99994,0,0,1-2.931-2.36047l-.66583-3.05176a2.99143,2.99143,0,0,1-1.31073-1.462ZM32,6a6,6,0,1,1-6-6A6,6,0,0,1,32,6Zm-3-.5a.5.5,0,0,0-.5-.5H27V3.5a.5.5,0,0,0-.5-.5h-1a.5.5,0,0,0-.5.5V5H23.5a.5.5,0,0,0-.5.5v1a.5.5,0,0,0,.5.5H25V8.5a.5.5,0,0,0,.5.5h1a.5.5,0,0,0,.5-.5V7h1.5a.5.5,0,0,0,.5-.5ZM26.06885,22.87207l-5.13623-2.7052A5.02336,5.02336,0,0,1,16.44727,23H14.55273a5.02379,5.02379,0,0,1-4.48553-2.833l-5.136,2.70508A1.57806,1.57806,0,0,0,4,24.23669V27a1,1,0,0,0,1,1H26a1,1,0,0,0,1-1V24.23669A1.57806,1.57806,0,0,0,26.06885,22.87207Z"/>
+</svg>
diff --git a/tmpl/block/avocatlist.tt b/tmpl/block/avocatlist.tt
index 1555568..a0b8590 100644
--- a/tmpl/block/avocatlist.tt
+++ b/tmpl/block/avocatlist.tt
@@ -12,6 +12,7 @@ order by lc.surname, lc.prename, lc.company;'); %]
 [% END%]
 <div class="container">
 <div class="avocat-items col-lg-12 row">
+        
         [% FOREACH avo = avolist.execute(link) %]
           <div class="col-sm-6 col-md-3 col-lg-3">
             <div class="avocat-item" style="border: 1px solid grey; text-align: center; padding: 5px;">
@@ -23,12 +24,21 @@ order by lc.surname, lc.prename, lc.company;'); %]
                 <div class="default-text" style="width: 100%; text-align: center;">[% avo.surname%] [% avo.prename %]<br/>([% avo.company %])</div>
                 
                 <img src="[% IF avo.photo %] [% abspath %][% avo.photo %] [% ELSE %] [% abspath %]img/logo-juridig.png [% END %]" class="img-responsive" style="height: 145px; " alt="[% avo.prename %] [% avo.surname %]"> </a>
-                
-                
-                
                  </div>
             </div>
         </div>
         [% END %]
+        <div class="col-sm-6 col-md-3 col-lg-3">
+            <div class="avocat-item" style="border: 1px solid grey; text-align: center; padding: 5px;">
+              <div class="hover-bg"> 
+              <a href="[% abspath %]backoffice/register.html" >
+                <div class="hover-text">
+                  <h4 style="color: red;font-weight: bold;">Pas Incris?<br><span style="font-size: 11px; color: red;font-weight: bold; ">Registrez vous!</span></h4>
+                </div>
+                <div class="default-text" style="width: 100%; text-align: center; color: red; font-weight: bold">Pas inscris?<br/>Registrez vous!</div>     
+                <img src="[% abspath %]img/user-plus.svg" class="img-responsive" style="height: 145px; " alt="Register User"> </a>
+                 </div>
+            </div>
+        </div>
       </div>
     </div>