From 8e163b10ab80b5e0be8abf5781e8420aca2d1950 Mon Sep 17 00:00:00 2001
From: Kilian Saffran <ksaffran@dks.lu>
Date: Fri, 8 Mar 2019 17:33:38 +0100
Subject: [PATCH] auto commit on 2019-03-08 17:33

---
 lib/processdata.php                           |  31 +++-
 site.js                                       |  19 ++-
 tmpl/pages/profile/addcompanyuser.php         |  20 +++
 tmpl/pages/profile/applications.php           |   1 +
 tmpl/pages/profile/deletecompanyprofile.php   |  11 ++
 ...eleteprofile.php => deleteuserprofile.php} |   4 +-
 tmpl/pages/profile/etudeusers.php             |  49 ++++++
 tmpl/pages/profile/profile.php                |  82 ++++++----
 tmpl/pages/profile/profileetude.php           | 146 ++++++++++++++++++
 tmpl/pages/profile/rendezvous/clientlist.php  |   2 +-
 .../profile/rendezvous/exceptionlist.php      |  35 -----
 .../profile/rendezvous/rendezvouslistold.php  |   2 +-
 .../profile/rendezvous/timesheetlist.php      |   2 +-
 13 files changed, 327 insertions(+), 77 deletions(-)
 create mode 100644 tmpl/pages/profile/addcompanyuser.php
 create mode 100644 tmpl/pages/profile/deletecompanyprofile.php
 rename tmpl/pages/profile/{deleteprofile.php => deleteuserprofile.php} (51%)
 create mode 100644 tmpl/pages/profile/etudeusers.php
 create mode 100644 tmpl/pages/profile/profileetude.php
 delete mode 100644 tmpl/pages/profile/rendezvous/exceptionlist.php

diff --git a/lib/processdata.php b/lib/processdata.php
index b95cf1f..6b28fa8 100644
--- a/lib/processdata.php
+++ b/lib/processdata.php
@@ -22,14 +22,29 @@
                     save_rendezvous($pdt);
                     break;
                 case 'submit_profile':
+                    if (!isset($pdt["uservisibility"])) { $pdt["uservisibility"] = "";}
                     save_data('users',$pdt);
                     break;
+                case 'submit_profileetude':
+                    if (!isset($pdt["companyvisibility"])) { $pdt["companyvisibility"] = "";}
+                    save_data('company',$pdt);
+                    break;
+                case 'submit_deletecompanyprofile':
+                    delete_profile_company($pdt);
+                    break;
+                case 'submit_deleteuserprofile':
+                    delete_profile_user($pdt);
+                    break;
                 case 'submit_rendezvous':
                     save_data('events',$pdt);
                     break;
                 case 'submit_timesheet':
                     save_data('timesheets',$pdt);
                     break;
+                case 'submit_addcompanyprofile':
+                    send_company_invitation($pdt);
+                    break;
+                  
             }
         } else {
             if ($user != null){ return; }
@@ -70,7 +85,7 @@
                     break;
                 case 'edit':
                     break;
-                case 'delete':
+                case 'deletetimesheet':
                     break;
             }
           }
@@ -249,7 +264,7 @@
             //$p='profile';
         }else {
             setcookie("juridig","");
-            $msg='<div class="alert alert-danger">'.$sql.'<br/>Utilisateur et/ou mot de passe non connu!</div>';
+            $msg='<div class="alert alert-danger">Utilisateur et/ou mot de passe non connu!</div>';
             //$p='/home';
         }
         return $retuser;
@@ -382,4 +397,16 @@
         
         return $rows;
     }
+
+    function send_company_invitation($pdt){
+
+    }
+
+    function delete_profile_company($pdt){
+
+    }
+
+    function delete_profile_user($pdt){
+
+    }
 ?>
\ No newline at end of file
diff --git a/site.js b/site.js
index f0ec513..3571c61 100644
--- a/site.js
+++ b/site.js
@@ -37,8 +37,15 @@ $( document ).ready(function() {
 
 function handleFileSelect(evt) {
   var files = evt.target.files; // FileList object
+  var utype = "";
+  if ($("form").attr('id') = "dksrdv_userprofile"){
+    utype = "user";
+  } else if ($("form").attr('id') = "dksrdv_companyprofile"){
+    utype = "company";
+  }
+  $("form").prepend('<input type="hidden"  id="'+ utype+'photo" name="'+ utype+'photo" value=""/>');
   //if (!$("#userphoto")){
-    $("form#dksrdv_userprofile").prepend('<input type="hidden"  id="userphoto" name="userphoto" value=""/>');
+    
   //}
   // Loop through the FileList and render image files as thumbnails.
   for (var i = 0, f; f = files[i]; i++) {
@@ -54,8 +61,8 @@ function handleFileSelect(evt) {
     reader.onload = (function(theFile) {
       return function(e) {
         $("#preview").attr("src",e.target.result);
-        $("#userphoto").val(e.target.result);
-        console.log($("#userphoto"));
+        $("#"+utype+"photo").val(e.target.result);
+        //console.log($("#userphoto"));
       };
     })(f);
 
@@ -65,10 +72,10 @@ function handleFileSelect(evt) {
   
 }
 
-function removephoto(){
+function removephoto(utype){
   $("#preview").attr("src",defaultphoto);
-  if (!$("#userphoto")){
-    $("form#dksrdv_userprofile").prepend('<input type="hidden"  id="userphoto" name="userphoto" value=""/>');
+  if (!$("#"+utype+"photo")){
+    $("form").prepend('<input type="hidden"  id="'+utype+'photo" name="'+utype+'photo" value=""/>');
   }
 }
 
diff --git a/tmpl/pages/profile/addcompanyuser.php b/tmpl/pages/profile/addcompanyuser.php
new file mode 100644
index 0000000..3248359
--- /dev/null
+++ b/tmpl/pages/profile/addcompanyuser.php
@@ -0,0 +1,20 @@
+<?php
+
+?>
+<form id="dksrdv_addcompanyuser" name="dksrdv_addcompanyuser" class="dks needs-validation" method="POST" novalidate>
+  <input type="hidden" name="id_user" value="<?php echo $user['id']; ?>" />
+<div class="row card">
+      <div class="card-header"><h5>Ajouter un utilisateur</h5></div>
+      <div class="card-body row">
+        <div class="col-sm-4">
+          <div class="form-group">
+              <label for="useremail">Email (...@barreau.lu) du avocat à inviter</label>
+              <input type="email" class="form-control" id="useremail" name="useremail" required value="">
+          </div>
+          <div class="form-group">
+              <button class="btn btn-primary" type="submit" name="submit_addcompanyprofile">Envoyer la demande</button> 
+          </div>
+        </div>
+      </div>
+</div>
+</form>
\ No newline at end of file
diff --git a/tmpl/pages/profile/applications.php b/tmpl/pages/profile/applications.php
index db41a9a..02e451a 100644
--- a/tmpl/pages/profile/applications.php
+++ b/tmpl/pages/profile/applications.php
@@ -14,6 +14,7 @@
             if (($appdata["activated"] == 1) || ($user["usergroup"] == "administrator")){
             
     ?>
+    
     <div class="card" style="border-top: 1px solid grey;">
         <div class="card-body">
         <div class="row">
diff --git a/tmpl/pages/profile/deletecompanyprofile.php b/tmpl/pages/profile/deletecompanyprofile.php
new file mode 100644
index 0000000..0db0c81
--- /dev/null
+++ b/tmpl/pages/profile/deletecompanyprofile.php
@@ -0,0 +1,11 @@
+<form id="dksrdv_deletecompanyprofile" name="dksrdv_deleteprofile" class="dks needs-validation" method="POST" novalidate>
+    <div class="card">
+        <h5>êtes vous sûre de vouloir supprimer profile d'étude?</h5>
+        <button type="submit" name="submit_deletecompanyprofile" class="btn btn-danger" >Supprimer maintenant</button>
+    </div>
+</form>
+<script type="text/javascript">
+            function initdata(){
+                initstandard();
+            }
+        </script>
\ No newline at end of file
diff --git a/tmpl/pages/profile/deleteprofile.php b/tmpl/pages/profile/deleteuserprofile.php
similarity index 51%
rename from tmpl/pages/profile/deleteprofile.php
rename to tmpl/pages/profile/deleteuserprofile.php
index 0b44d0a..ee9a9b0 100644
--- a/tmpl/pages/profile/deleteprofile.php
+++ b/tmpl/pages/profile/deleteuserprofile.php
@@ -1,7 +1,7 @@
-<form id="dksrdv_deleteprofile" name="dksrdv_deleteprofile" class="dks needs-validation" method="POST" novalidate>
+<form id="dksrdv_deleteuserprofile" name="dksrdv_deleteuserprofile" class="dks needs-validation" method="POST" novalidate>
     <div class="card">
         <h5>êtes vous sûre de vouloir supprimer votre profile, y inclus tous vous données d'application?</h5>
-        <button class="btn btn-danger">Supprimer maintenant</button>
+        <button type="submit" name="submit_deleteuserprofile" class="btn btn-danger">Supprimer maintenant</button>
     </div>
 </form>
 <script type="text/javascript">
diff --git a/tmpl/pages/profile/etudeusers.php b/tmpl/pages/profile/etudeusers.php
new file mode 100644
index 0000000..5edf917
--- /dev/null
+++ b/tmpl/pages/profile/etudeusers.php
@@ -0,0 +1,49 @@
+<?php 
+  $where = " usr.id=".$user['id'];
+  if ($user['id_company'] != null){
+    $where = " usr.id_company=".$user['id_company'];
+  }
+  $sql = "select usr.id,usr.useremail,CONCAT(usr.userprename,' ',usr.usersurname) as username, usr.uservisibility,
+  case when usrv.service = 'rendezvous' then 1 else null end as apprendezvous,
+  case when usrv.service = 'billjee' then 1 else null end as appbilljee
+  from users usr LEFT join userservices usrv on (usr.id=usrv.id_user) where ".$where." group by usr.id;";
+  $tablelist = $db->dbqueryall($sql);
+?>
+<h5>Utilistateurs d'étude</h5>
+<table class="table table-striped table-bordered"  data-toggle="table">
+<thead class="thead-dark"><tr>
+<th data-sortable="true">Email</th>
+<th data-sortable="true">Nom</th>
+<th data-sortable="true">Annuaire</th>
+<th data-sortable="true">Rendez-Vous</th>
+<th data-sortable="true">Billjee</th>
+<th data-width="120">
+  <button class="btn btn-primary" onclick="location.href='<?php echo $baseurl; ?>/profile/addcompanyuser';"><i class="fas fa-plus"></i></button>
+ </th>
+</tr></thead>
+        <tbody>
+            <?php
+                foreach ($tablelist as $row){
+            ?>
+            <tr data-id="<?php echo $row['id']; ?>">
+                <td><?php echo $row['useremail']; ?></td>
+                <td><?php echo $row['username']; ?></td>
+                <td><?php echo (($row['uservisibility'] == 1)?'<i class="fas fa-check"></i>':''); ?></td>
+                <td><?php echo (($row['apprendezvous'] == 1)?'<i class="fas fa-check"></i>':''); ?></td>
+                <td><?php echo (($row['appbilljee'] == 1)?'<i class="fas fa-check"></i>':''); ?></td>
+                <td>
+                  <?php
+                    if (count($tablelist) > 1){
+                      ?>
+                        <button class="btn btn-danger" onclick="location.href='<?php echo $baseurl; ?>/profile/etudeusers?action=removeuser&id=<?php echo $row['id']; ?>"><i class="fas fa-trash"></i></button>
+                      <?php  
+                    }
+                    
+                  ?>
+                </td>
+            </tr>
+            <?php    
+                }
+            ?>
+        </tbody>
+</table>
\ No newline at end of file
diff --git a/tmpl/pages/profile/profile.php b/tmpl/pages/profile/profile.php
index b8dc4bf..f84a03b 100644
--- a/tmpl/pages/profile/profile.php
+++ b/tmpl/pages/profile/profile.php
@@ -9,10 +9,21 @@
 ?>
 <div class="row">
 <div class="col-sm-2 sidebar card">
-<h6 class="dropdown-header">Profile</h6>
+<h6 class="dropdown-header">Profile d'Avocat</h6>
         <a class="dropdown-item" href="<?php echo $baseurl; ?>/profile">Mon Profile</a>
         <a class="dropdown-item" href="<?php echo $baseurl; ?>/profile/changepassword">Changer Mot de Passe</a>
-        <a class="dropdown-item" href="<?php echo $baseurl; ?>/profile/deleteprofile">Supprimer mon profile</a>
+        <a class="dropdown-item" href="<?php echo $baseurl; ?>/profile/deleteuserprofile">Supprimer mon profile</a>
+        <?php
+          if ($user['usergroup'] != 'client'){
+            ?>
+            <h6 class="dropdown-header">Profile d'Étude</h6>
+            <a class="dropdown-item" href="<?php echo $baseurl; ?>/profile/profileetude">Profile d'Étude</a>
+            <a class="dropdown-item" href="<?php echo $baseurl; ?>/profile/etudeusers">Avocats d'Étude</a>
+            <a class="dropdown-item" href="<?php echo $baseurl; ?>/profile/deletecompanyprofile">Supprimer le profile</a>
+            <?php
+          }
+        ?>
+        
         <div class="dropdown-divider"></div>
         <?php
             if ($user['usergroup'] == 'client'){
@@ -62,6 +73,8 @@
     if ($subpath != ""){
         include($_SERVER["DOCUMENT_ROOT"].$baseurl."/tmpl/pages/".$subpath.'.php');
     } else {
+    $sql = "select * from users where id='".$user['id']."';";
+    $userprofile = $db->dbquery($sql);
 ?>
 <form id="dksrdv_userprofile" name="dksrdv_userprofile" class="dks needs-validation" method="POST" novalidate>
     <input type="hidden" name="id" value="<?php echo $user['id']; ?>" />
@@ -73,37 +86,37 @@
                         <h6>Mes coordonnées</h6>  
                         <div class="form-group">
                                 <label for="usersurname">Nom <sup>(*)</sup></label>
-                                <input type="text" class="form-control" id="usersurname" name="usersurname"   required value="<?php echo $user['usersurname']; ?>">
+                                <input type="text" class="form-control" id="usersurname" name="usersurname"   required value="<?php echo $userprofile['usersurname']; ?>">
                             </div>
                             <div class="form-group">
                                 <label for="userprename">Prénom <sup>(*)</sup></label>
-                                <input type="text" class="form-control" id="userprename" name="userprename"  required  value="<?php echo $user['userprename']; ?>">
+                                <input type="text" class="form-control" id="userprename" name="userprename"  required  value="<?php echo $userprofile['userprename']; ?>">
                             </div>
                             <div class="form-group">
                                 <label for="useremail">Email <sup>(*)</sup></label>
-                                <input type="email" class="form-control" id="useremail" name="useremail"   required  value="<?php echo $user['useremail']; ?>">
+                                <input type="email" class="form-control" id="useremail" name="useremail"   required  value="<?php echo $userprofile['useremail']; ?>">
                            
                             </div>
                             <div class="form-group">
                                 <label for="userphone">Phone</label>
-                                <input type="text" class="form-control" id="userphone" name="userphone" value="<?php echo $user['userphone']; ?>">
+                                <input type="text" class="form-control" id="userphone" name="userphone" value="<?php echo $userprofile['userphone']; ?>">
                             </div>
                             <?php if ($user['usergroup'] != 'client') { ?>
                             <div class="form-group">
                                     <label for="usercompany">Étude</label>
-                                    <input type="text" class="form-control" id="usercompany" name="usercompany" value="<?php echo $user['usercompany']; ?>">
+                                    <input type="text" class="form-control" id="usercompany" name="usercompany" value="<?php echo $userprofile['usercompany']; ?>">
                                 </div>
                             <div class="form-group">
                                 <label for="useraddress">addresse</label>
-                                <input type="text" class="form-control" id="useraddress" name="useraddress" value="<?php echo $user['useraddress']; ?>">
+                                <input type="text" class="form-control" id="useraddress" name="useraddress" value="<?php echo $userprofile['useraddress']; ?>">
                             </div>
                             <div class="form-group">
                                 <label for="userzip">code postale</label>
-                                <input type="text" class="form-control" id="userzip" name="userzip" value="<?php echo $user['userzip']; ?>">
+                                <input type="text" class="form-control" id="userzip" name="userzip" value="<?php echo $userprofile['userzip']; ?>">
                             </div>
                             <div class="form-group">
                                 <label for="usercity">Ville</label>
-                                <input type="text" class="form-control" id="usercity" name="usercity" value="<?php echo $user['usercity']; ?>">
+                                <input type="text" class="form-control" id="usercity" name="usercity" value="<?php echo $userprofile['usercity']; ?>">
                             </div> 
                             <?php } ?>
                 </div>
@@ -117,7 +130,7 @@
                         
                         
                         <div class="col-sm-4">
-                            <img src="<?php echo (($user["userphoto"] != '')?$user["userphoto"]:$baseurl.'/img/no-image.png'); ?>" style="width: 150px; max-width: 150px; max-height: 150px;" id="preview"/>
+                            <img src="<?php echo (($userprofile["userphoto"] != '')?$userprofile["userphoto"]:$baseurl.'/img/no-image.png'); ?>" style="width: 150px; max-width: 150px; max-height: 150px;" id="preview"/>
                         </div>
     <div class="col-sm-8">
             <div class="input-group">
@@ -131,26 +144,37 @@
                   </div>
         <!-- <input type="file" id="photo" class="btn btn-info" /> -->
       <!-- <button type="button" class="btn btn-info" >Ajouter/Remplayer Photo</button> -->
-      <a class="btn btn-danger" onclick="javascript:removephoto();"><i class="fas fa-trash"></i>&nbsp;supprimer la photo</a>
+      <a class="btn btn-danger" onclick="javascript:removephoto('user');"><i class="fas fa-trash"></i>&nbsp;supprimer la photo</a>
     </div>
   </div>
                     </div>
                 <div class="form-group">
                   <label for="userspecialisations">Spécialisations</label>
-                    <input type="text" class="form-control" id="userspecialisations" name="userspecialisations" data-role="tagsinput"    value="<?php echo $user['userspecialisations']; ?>">
+                    <input type="text" class="form-control" id="userspecialisations" name="userspecialisations" data-role="tagsinput"    value="<?php echo $userprofile['userspecialisations']; ?>">
                   </div>
-                  <div class="form-group">
-                  <label for="userprice">Prix mandataire (à partir de)</label>
-                  <div class="input-group">
-                    <input type="text" class="form-control" style="text-align: right;" id="userprice" name="userprice" pattern="[0-9,]+" value="<?php echo $user['userprice']; ?>">
-                    <div class="input-group-append">
-      <div class="input-group-text">&euro;</div>
-    </div>
-                    </div>
+                  <div class="row">
+                      <div class="col-sm-6">
+                      <div class="form-group">
+                        <label for="uservisibility">Visualiser profile dans l'annuaire</label>
+                        <input type="checkbox" class="form-control" value="1" id="uservisibility" name="uservisibility" <?php echo (($userprofile['uservisibility'] == 1)? "checked":"") ?> />
+                      </div>
+                      </div>
+                      <div class="col-sm-6">
+                      <div class="form-group">
+                        <label for="userprice">Prix mandataire (à partir de)</label>
+                        <div class="input-group">
+                          <input type="text" class="form-control" style="text-align: right;" id="userprice" name="userprice" pattern="[0-9,]+" value="<?php echo $userprofile['userprice']; ?>">
+                          <div class="input-group-append">
+                            <div class="input-group-text">&euro;</div>
+                          </div>
+                         </div>
                   </div>
+                      </div>
+                  </div>
+                  
                   <div class="form-group">
                     <label for="userdescription">Description individuelle</label>
-                      <textarea class="form-control richeditarea" rows="5" id="userdescription" name="userdescription"><?php echo $user['userdescription']; ?></textarea>
+                      <textarea class="form-control richeditarea" rows="5" id="userdescription" name="userdescription"><?php echo $userprofile['userdescription']; ?></textarea>
                     </div>
                     <div class="row">
                     <div class="col-sm-12">
@@ -159,27 +183,27 @@
                     <div class="col-sm-6">
                       <div class="form-group">
                       <label for="consultmon">Lundi</label>
-                      <input type="text" class="form-control" id="consultmo" name="consultmon" value="<?php echo $user['consultmon']; ?>"    >  
+                      <input type="text" class="form-control" id="consultmo" name="consultmon" value="<?php echo $userprofile['consultmon']; ?>"    >  
                       </div>
                       <div class="form-group">
-                      <label for="consulttue">Mardi</label><input type="text" class="form-control" id="consulttu" name="consulttue" value="<?php echo $user['consulttue']; ?>"    >  
+                      <label for="consulttue">Mardi</label><input type="text" class="form-control" id="consulttu" name="consulttue" value="<?php echo $userprofile['consulttue']; ?>"    >  
                       </div>
                       <div class="form-group">
-                      <label for="consultwed">Merceredi</label><input type="text" class="form-control" id="consultwe" name="consultwed" value="<?php echo $user['consultwed']; ?>"    >  
+                      <label for="consultwed">Merceredi</label><input type="text" class="form-control" id="consultwe" name="consultwed" value="<?php echo $userprofile['consultwed']; ?>"    >  
                       </div>
                       <div class="form-group">
-                      <label for="consultthu">Jeudi</label><input type="text" class="form-control" id="consultth" name="consultthu" value="<?php echo $user['consultthu']; ?>"    >  
+                      <label for="consultthu">Jeudi</label><input type="text" class="form-control" id="consultth" name="consultthu" value="<?php echo $userprofile['consultthu']; ?>"    >  
                       </div>
                     </div>
                     <div class="col-sm-6">
                       <div class="form-group">
-                      <label for="consultfri">Vendredi</label><input type="text" class="form-control" id="consultfr" name="consultfri" value="<?php echo $user['consultfri']; ?>"    >  
+                      <label for="consultfri">Vendredi</label><input type="text" class="form-control" id="consultfr" name="consultfri" value="<?php echo $userprofile['consultfri']; ?>"    >  
                       </div>
                       <div class="form-group">
-                      <label for="consultsat">Samedi</label><input type="text" class="form-control" id="consultsa" name="consultsat" value="<?php echo $user['consultsat']; ?>"   >  
+                      <label for="consultsat">Samedi</label><input type="text" class="form-control" id="consultsa" name="consultsat" value="<?php echo $userprofile['consultsat']; ?>"   >  
                       </div>
                       <div class="form-group">
-                      <label for="consultsun">Dimanche</label><input type="text" class="form-control" id="consultsu" name="consultsun" value="<?php echo $user['consultsun']; ?>"   >  
+                      <label for="consultsun">Dimanche</label><input type="text" class="form-control" id="consultsu" name="consultsun" value="<?php echo $userprofile['consultsun']; ?>"   >  
                       </div>
                     </div>
                     </div>
diff --git a/tmpl/pages/profile/profileetude.php b/tmpl/pages/profile/profileetude.php
new file mode 100644
index 0000000..33f917a
--- /dev/null
+++ b/tmpl/pages/profile/profileetude.php
@@ -0,0 +1,146 @@
+<?php
+  $sql = "select * from company where id=(select id_company from users where id='".$user['id']."');";
+  $company = $db->dbquery($sql);
+?>
+  <form id="dksrdv_companyprofile" name="dksrdv_companyprofile" class="dks needs-validation" method="POST" novalidate>
+  <input type="hidden" name="id" value="<?php echo $company['id']; ?>" />
+<div class="row card">
+      <div class="card-header"><h5>Profile d'Étude</h5></div>
+      <div class="card-body row">
+
+<div class="col-sm-3">
+                      <h6>Coordonnées</h6>  
+                      <div class="form-group">
+                                  <label for="companyname">Nom de l'Étude</label>
+                                  <input type="text" class="form-control" id="companyname" name="companyname" value="<?php echo $company['companyname']; ?>">
+                              </div>
+                          <div class="form-group">
+                              <label for="companyemail">Email <sup>(*)</sup></label>
+                              <input type="email" class="form-control" id="companyemail" name="companyemail"   required  value="<?php echo $company['companyemail']; ?>">
+                         
+                          </div>
+                          <div class="form-group">
+                              <label for="companyphone">Phone</label>
+                              <input type="text" class="form-control" id="companyphone" name="companyphone" value="<?php echo $company['companyphone']; ?>">
+                          </div>
+                         
+                          
+                          <div class="form-group">
+                              <label for="companyaddress">addresse</label>
+                              <input type="text" class="form-control" id="companyaddress" name="companyaddress" value="<?php echo $company['companyaddress']; ?>">
+                          </div>
+                          <div class="form-group">
+                              <label for="companyzip">code postale</label>
+                              <input type="text" class="form-control" id="companyzip" name="companyzip" value="<?php echo $company['companyzip']; ?>">
+                          </div>
+                          <div class="form-group">
+                              <label for="companycity">Ville</label>
+                              <input type="text" class="form-control" id="companycity" name="companycity" value="<?php echo $company['companycity']; ?>">
+                          </div> 
+                  
+              </div>
+          
+              <div class="col-sm-8">
+              <h6>Descriptions</h6>
+              <div class="col-sm-12">
+                  <div class="row">
+                      
+                      
+                      <div class="col-sm-4">
+                          <img src="<?php echo (($company["companyphoto"] != '')?$company["companyphoto"]:$baseurl.'/img/no-image.png'); ?>" style="width: 150px; max-width: 150px; max-height: 150px;" id="preview"/>
+                      </div>
+  <div class="col-sm-8">
+          <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text" id="inputFile">Photo</span>
+                  </div>
+                  <div class="custom-file">
+                    <input type="file" class="custom-file-input" id="files" aria-describedby="inputFile" >
+                    <label class="custom-file-label" for="files">Selection fichier</label>
+                  </div>
+                </div>
+      <!-- <input type="file" id="photo" class="btn btn-info" /> -->
+    <!-- <button type="button" class="btn btn-info" >Ajouter/Remplayer Photo</button> -->
+    <a class="btn btn-danger" onclick="javascript:removephoto('company');"><i class="fas fa-trash"></i>&nbsp;supprimer la photo</a>
+  </div>
+</div>
+                  </div>
+              <div class="form-group">
+                <label for="companyspecialisations">Spécialisations</label>
+                  <input type="text" class="form-control" id="companyspecialisations" name="companyspecialisations" data-role="tagsinput"    value="<?php echo $company['companyspecialisations']; ?>">
+                </div>
+                <div class="row">
+                  <div class="col-sm-6">
+                  <div class="form-group">
+                    <label for="companyvisibility">Visualiser profile dans l'annuaire</label>
+                    <input type="checkbox" class="form-control" value="1" id="companyvisibility" name="companyvisibility" <?php echo (($company['companyvisibility'] == 1)? "checked":"") ?> />
+                    
+                  </div>
+                </div>
+                <div class="col-sm-6">
+                <div class="form-group">
+                <label for="companyprice">Prix mandataire (à partir de)</label>
+                <div class="input-group">
+                  <input type="text" class="form-control" style="text-align: right;" id="companyprice" name="companyprice" pattern="[0-9,]+" value="<?php echo $company['companyprice']; ?>">
+                  <div class="input-group-append">
+    <div class="input-group-text">&euro;</div>
+  </div>
+                  </div>
+                </div>
+                </div>
+                </div>
+                <div class="form-group">
+                  <label for="companydescription">Description individuelle</label>
+                    <textarea class="form-control richeditarea" rows="5" id="companydescription" name="companydescription"><?php echo $company['companydescription']; ?></textarea>
+                  </div>
+                  <div class="row">
+                  <div class="col-sm-12">
+                  <label for="companydescription">mes horaires de consultation</label>
+                  </div>
+                  <div class="col-sm-6">
+                    <div class="form-group">
+                    <label for="consultmon">Lundi</label>
+                    <input type="text" class="form-control" id="consultmo" name="consultmon" value="<?php echo $company['consultmon']; ?>"    >  
+                    </div>
+                    <div class="form-group">
+                    <label for="consulttue">Mardi</label><input type="text" class="form-control" id="consulttu" name="consulttue" value="<?php echo $company['consulttue']; ?>"    >  
+                    </div>
+                    <div class="form-group">
+                    <label for="consultwed">Merceredi</label><input type="text" class="form-control" id="consultwe" name="consultwed" value="<?php echo $company['consultwed']; ?>"    >  
+                    </div>
+                    <div class="form-group">
+                    <label for="consultthu">Jeudi</label><input type="text" class="form-control" id="consultth" name="consultthu" value="<?php echo $company['consultthu']; ?>"    >  
+                    </div>
+                  </div>
+                  <div class="col-sm-6">
+                    <div class="form-group">
+                    <label for="consultfri">Vendredi</label><input type="text" class="form-control" id="consultfr" name="consultfri" value="<?php echo $company['consultfri']; ?>"    >  
+                    </div>
+                    <div class="form-group">
+                    <label for="consultsat">Samedi</label><input type="text" class="form-control" id="consultsa" name="consultsat" value="<?php echo $company['consultsat']; ?>"   >  
+                    </div>
+                    <div class="form-group">
+                    <label for="consultsun">Dimanche</label><input type="text" class="form-control" id="consultsu" name="consultsun" value="<?php echo $company['consultsun']; ?>"   >  
+                    </div>
+                  </div>
+                  </div>
+                  
+              </div>
+
+              <div class="col-sm-12">
+                <button class="btn btn-primary" type="submit" name="submit_profileetude">Sauvegarder</button> 
+                
+                <p><small>(*) champs requis</small></p>
+              </div>
+             
+              </div>
+</form>
+<script type="text/javascript">
+var defaultphoto="<?php echo $baseurl; ?>/img/no-image.png";
+  function initdata(){
+    document.getElementById('files').addEventListener('change', handleFileSelect, false);           
+   initstandard();
+}
+</script>
+</div>
+</div>
diff --git a/tmpl/pages/profile/rendezvous/clientlist.php b/tmpl/pages/profile/rendezvous/clientlist.php
index e8516cb..72c914f 100644
--- a/tmpl/pages/profile/rendezvous/clientlist.php
+++ b/tmpl/pages/profile/rendezvous/clientlist.php
@@ -19,7 +19,7 @@
         <?php
                 foreach ($tablelist as $row){
             ?>
-            <tr data-id="<?php echo $row['id']; ?>">
+            <tr data-id="<?php echo $row['id_client']; ?>">
                 <td><?php echo $row['usersurname']; ?></td>
                 <td><?php echo $row['userprename']; ?></td>
                 <td><?php echo $row['useremail']; ?></td>
diff --git a/tmpl/pages/profile/rendezvous/exceptionlist.php b/tmpl/pages/profile/rendezvous/exceptionlist.php
deleted file mode 100644
index 5e1ab79..0000000
--- a/tmpl/pages/profile/rendezvous/exceptionlist.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
- $sql ="SELECT id, DATE_FORMAT(startdate,'%d/%m/%Y') as startdate, DATE_FORMAT(enddate,'%d/%m/%Y') as enddate, hour_values, weekdays FROM exceptions where id_user=".$user['id'].";";
- $tablelist = $db->dbqueryall($sql);
-?>
-<h5>Exceptions d'Horaires</h5>
-<table class="table table-striped table-bordered"  data-toggle="table">
-<thead class="thead-dark">
-  <tr>
-    <th data-sortable="true">Date début</th>
-    <th data-sortable="true">Date fin</th>
-    <th data-sortable="true">Jours</th>
-    <th data-sortable="true">heures</th>
-        <th>
-            <button class="btn btn-primary" onclick="location.href='<?php echo $baseurl; ?>/profile/rendezvous/exception';"><i class="fas fa-plus"></i></button>
-        </th>
-        </tr></thead>
-        <tbody>
-            <?php
-                foreach ($tablelist as $row){
-            ?>
-            <tr data-id="<?php echo $row['id']; ?>">
-                <td><?php echo $row['startdate']; ?></td>
-                <td><?php echo $row['endate']; ?></td>
-                <td><?php echo $row['weekdays']; ?></td>
-                <td><?php echo $row['hour_values']; ?></td>
-                <td>
-                    <button class="btn btn-info" onclick="location.href='<?php echo $baseurl; ?>/profile/rendezvous/timesheet?id=<?php echo $row['id']; ?>';"><i class="fas fa-edit"></i></button>
-                    <button class="btn btn-danger" onclick="location.href='<?php echo $baseurl; ?>/profile/rendezvous/timesheetlist?action=delete&id=<?php echo $row['id']; ?>"><i class="fas fa-trash"></i></button>
-                </td>
-            </tr>
-            <?php    
-                }
-            ?>
-        </tbody>
-</table>
\ No newline at end of file
diff --git a/tmpl/pages/profile/rendezvous/rendezvouslistold.php b/tmpl/pages/profile/rendezvous/rendezvouslistold.php
index cbcd1dd..748a5ae 100644
--- a/tmpl/pages/profile/rendezvous/rendezvouslistold.php
+++ b/tmpl/pages/profile/rendezvous/rendezvouslistold.php
@@ -64,7 +64,7 @@ $tablelist = $db->dbqueryall($sql);
                       echo '<span class="text-warning">INCONNUE</span>';
                     }; ?></td>
                 <?php } ?>
-                <td><button class="btn btn-danger" onclick="location.href='<?php echo $baseurl.'/rendezvouslistold?action=delete&id='.$row['id']; ?>';"><i class="fas fa-trash"></i></button></td>
+                <td><button class="btn btn-danger" onclick="location.href='<?php echo $baseurl.'/rendezvouslistold?action=deletetimesheet&id='.$row['id']; ?>';"><i class="fas fa-trash"></i></button></td>
         </tr>
         <?php    
                 }
diff --git a/tmpl/pages/profile/rendezvous/timesheetlist.php b/tmpl/pages/profile/rendezvous/timesheetlist.php
index 4fec7a9..82e25c3 100644
--- a/tmpl/pages/profile/rendezvous/timesheetlist.php
+++ b/tmpl/pages/profile/rendezvous/timesheetlist.php
@@ -26,7 +26,7 @@
                 <td><?php echo $row['options']; ?></td>
                 <td>
                     <button class="btn btn-info" onclick="location.href='<?php echo $baseurl; ?>/profile/rendezvous/timesheet?id=<?php echo $row['id']; ?>';"><i class="fas fa-edit"></i></button>
-                    <button class="btn btn-danger" onclick="location.href='<?php echo $baseurl; ?>/profile/rendezvous/timesheetlist?action=delete&id=<?php echo $row['id']; ?>"><i class="fas fa-trash"></i></button>
+                    <button class="btn btn-danger" onclick="location.href='<?php echo $baseurl; ?>/profile/rendezvous/timesheetlist?action=deletetimesheet&id=<?php echo $row['id']; ?>"><i class="fas fa-trash"></i></button>
                 </td>
             </tr>
             <?php    
-- 
2.39.5