diff --git a/modules/visa/class/class_modules_tools_Abstract.php b/modules/visa/class/class_modules_tools_Abstract.php
index 4e8908ef2d2932e1633da09637cda9f684957f8c..6df8ca37cf14149e675a73ae188916478226824a 100644
--- a/modules/visa/class/class_modules_tools_Abstract.php
+++ b/modules/visa/class/class_modules_tools_Abstract.php
@@ -551,6 +551,7 @@ abstract class visa_Abstract extends Database
$vised = ' currentVis';
$modif = 'false';
$disabled = '';
+ $link_vis = 'arrow-right ';
$del_vis = '<div class="delete_visa"></div>';
if($info_userVis['user_id'] <> $_SESSION['user']['UserId']){
$info_vised = '<p style="color:red;">Vous être en train de viser à la place de '.$info_userVis['firstname'].' '.$info_userVis['lastname'].'!</p>';
@@ -564,19 +565,20 @@ abstract class visa_Abstract extends Database
$vised = '';
if($bool_modif == true){
$modif = 'true';
- $del_vis = '<div class="delete_visa" onclick="delVisaUser(this.parentElement);"><i class="fa fa-trash" aria-hidden="true"></i></div>';
+ $del_vis = '<i class="fa fa-trash" aria-hidden="true" onclick="delVisaUser(this.parentElement.parentElement);" title="'._DELETE.'"></i>';
$disabled = '';
}else{
$modif = 'false';
- $del_vis = '<div class="delete_visa"></div>';
+ $del_vis = '';
$disabled = ' disabled="disabled"';
}
$info_vised = '';
+ $link_vis = 'hourglass';
}
- $link_vis = 'arrow-down';
+
$lastUserVis = false;
@@ -586,13 +588,28 @@ abstract class visa_Abstract extends Database
$vised = ' vised';
$link_vis = 'check';
$disabled = ' disabled="disabled"';
- $info_vised = '<span style="display:block;color:green;">(à visé le : '.functions::format_date_db($info_userVis['process_date'],'','',true).')</span>';
- $del_vis = '<div class="delete_visa"></div>';
+ $info_vised = '<br/><sub>visé le : '.functions::format_date_db($info_userVis['process_date'],'','',true).'</sub>';
+ $del_vis = '';
}
+ //VISA USER LINE CIRCUIT
$str .= '<div class="droptarget'.$vised.'" id="visa_'.$i.'" draggable="'.$modif.'">';
- $str .= '<span style="float:left;"><i class="fa fa-user fa-2x" aria-hidden="true"></i> '.$info_userVis['lastname'].' '.$info_userVis['firstname'].' <sup class="nbRes">'.$info_userVis['entity_id'].'</sup></span>'.$del_vis.'<span style="float:right;width:50%;"><input class="userId" type="hidden" value="'.$info_userVis['user_id'].'"/><input class="visaDate" type="hidden" value="'.$info_userVis['process_date'].'"/><input'.$disabled.' class="consigne" type="text" value="'.$info_userVis['process_comment'].'"/></span><div style="clear:both;"></div>'.$info_vised;
+ $str .= '<span class="visaUserStatus">';
+ $str .= '<i class="fa fa-'.$link_vis.'" aria-hidden="true"></i>';
+ $str .= '</span>';
+ $str .= '<span class="visaUserInfo">';
+ $str .= '<i class="fa fa-user fa-2x" aria-hidden="true"></i> '.$info_userVis['lastname'].' '.$info_userVis['firstname'].' <sup class="nbRes">'.$info_userVis['entity_id'].'</sup>'.$info_vised;
+ $str .= '</span>';
+ $str .= '<span class="visaUserConsigne">';
+ $str .= '<input class="userId" type="hidden" value="'.$info_userVis['user_id'].'"/><input class="visaDate" type="hidden" value="'.$info_userVis['process_date'].'"/><input'.$disabled.' class="consigne" type="text" value="'.$info_userVis['process_comment'].'"/>';
+ $str .= '</span>';
+ $str .= '<span class="visaUserAction">';
+ $str .= $del_vis;
+ $str .= '</span>';
+ $str .= '<span id="dropZone">';
+ $str .= '<i class="fa fa-exchange fa-2x fa-rotate-90" aria-hidden="true"></i>';
+ $str .= '</span>';
$str .= '</div>';
- $str .= '<div class="droptarget_arrow'.$vised.'" id="visa_'.$i.'_arrow"><span><i class="fa fa-'.$link_vis.'" aria-hidden="true"></i></span></div>';
+
$i++;
}
}
@@ -606,7 +623,8 @@ abstract class visa_Abstract extends Database
$vised = ' currentVis';
$modif = 'false';
$disabled = '';
- $del_vis = '<div class="delete_visa"></div>';
+ $del_vis = '';
+ $link_vis = 'arrow-right ';
if($info_userSign['user_id'] <> $_SESSION['user']['UserId']){
$info_vised = '<p style="color:red;">Vous être en train de signer à la place de '.$info_userSign['firstname'].' '.$info_userSign['lastname'].'!</p>';
}else{
@@ -619,26 +637,42 @@ abstract class visa_Abstract extends Database
$vised = '';
if($bool_modif == true){
$modif = 'true';
- $del_vis = '<div class="delete_visa" onclick="delVisaUser(this.parentElement);"><i class="fa fa-trash" aria-hidden="true"></i></div>';
+ $del_vis = '<i class="fa fa-trash" aria-hidden="true" onclick="delVisaUser(this.parentElement.parentElement);"></i>';
$disabled = '';
}else{
$modif = 'false';
- $del_vis = '<div class="delete_visa"></div>';
+ $del_vis = '';
$disabled = ' disabled="disabled"';
}
$info_vised = '';
-
+ $link_vis = 'hourglass';
}
+
}else{
$modif = 'false';
$vised = ' vised';
$link_vis = 'check';
$info_vised = '<span style="display:block;color:green;">(à signé le : '.functions::format_date_db($info_userVis['process_date'],'','',true).')</span>';
}
+ //VISA USER LINE CIRCUIT
$str .= '<div class="droptarget'.$vised.'" id="visa_'.$i.'" draggable="'.$modif.'">';
- $str .= '<span style="float:left;"><i class="fa fa-user fa-2x" aria-hidden="true"></i> '.$info_userSign['lastname'].' '.$info_userSign['firstname'].' <sup class="nbRes">'.$info_userSign['entity_id'].'</sup></span>'.$del_vis.'<span style="float:right;width:50%;"><input class="userId" type="hidden" value="'.$info_userSign['user_id'].'"/><input class="visaDate" type="hidden" value="'.$info_userSign['process_date'].'"/><input'.$disabled.' class="consigne" type="text" value="'.$info_userSign['process_comment'].'"/></span><div style="clear:both;"></div>'.$info_vised;
+ $str .= '<span class="visaUserStatus">';
+ $str .= '<i class="fa fa-'.$link_vis.'" aria-hidden="true"></i>';
+ $str .= '</span>';
+ $str .= '<span class="visaUserInfo">';
+ $str .= '<i class="fa fa-user fa-2x" aria-hidden="true"></i> '.$info_userSign['lastname'].' '.$info_userSign['firstname'].' <sup class="nbRes">'.$info_userSign['entity_id'].'</sup>';
+ $str .= '</span>';
+ $str .= '<span class="visaUserConsigne">';
+ $str .= '<input class="userId" type="hidden" value="'.$info_userSign['user_id'].'"/><input class="visaDate" type="hidden" value="'.$info_userSign['process_date'].'"/><input'.$disabled.' class="consigne" type="text" value="'.$info_userSign['process_comment'].'"/>'.$info_vised;
+ $str .= '</span>';
+ $str .= '<span class="visaUserAction">';
+ $str .= $del_vis;
+ $str .= '</span>';
+ $str .= '<span id="dropZone">';
+ $str .= '<i class="fa fa-exchange fa-2x fa-rotate-90" aria-hidden="true"></i>';
+ $str .= '</span>';
$str .= '</div>';
$i++;
}
diff --git a/modules/visa/css/module.css b/modules/visa/css/module.css
index f6330f2b9996b5653c174f31acfbebd31a3538e9..cdfd1c640305d584b19a4ec72a169f8228f841fe 100644
--- a/modules/visa/css/module.css
+++ b/modules/visa/css/module.css
@@ -124,62 +124,29 @@
width: 100%;
}
.droptarget{
+ position: relative;
background-color: #93D1E4;
-}
-.droptarget, .vised{
- text-align: center;
- display: block;
+ display: table;
+ margin: 10px;
padding: 10px;
- border: 2px solid #93D1E4;
+ text-align: left;
+ width: 95%;
cursor: default;
- width: 90%;
- margin:auto;
-}
-.droptarget_arrow {
- border: none;
- display:block;
- width: 90%;
- margin:auto;
- padding : 15px;
}
.droptarget_arrow {
border: none;
- display:block;
+ display:table-cell;
}
.vised{
- //opacity: 0.5;
- //color: green;
- border: solid 2px green;
-}
-
-.droptarget_arrow.vised{
- padding : 15px;
- border:none;
- opacity: 1;
+ opacity: 0.5;
color: green;
-}
-
-.delete_visa{
- visibility: hidden;
- float: right;
- color: red;
-}
-
-.droptarget:hover .delete_visa{
- visibility:visible;
-}
-
-.delete_visa{
- cursor:pointer;
- width:5%;
- margin:5px;
+ border: solid 2px green;
}
.droptarget input{
width : 100%;
- margin-right:10px;
}
#visaUserList{
@@ -190,4 +157,62 @@
.droptarget.currentVis{
color : #009DC5;
border: solid 2px #009DC5;
+}
+
+.visaUserInfo,.visaUserStatus,.visaUserConsigne,.visaUserAction{
+ display: table-cell;
+ vertical-align: middle;
+}
+
+.visaUserStatus{
+ width: 5%;
+ opacity: 0.5;
+}
+.vised .visaUserStatus{
+ opacity: 1;
+}
+.visaUserInfo{
+ width: 45%;
+ font-weight: bold;
+}
+
+.visaUserInfo .nbRes{
+ background-color: grey;
+ font-weight: normal;
+}
+
+.visaUserInfo sub{
+ font-weight: normal;
+}
+
+.droptarget:hover.vised #dropZone{
+ visibility: hidden;
+}
+.droptarget:hover #dropZone{
+ visibility: visible;
+}
+
+#dropZone,#dropZone:active{
+ width: 5%;
+ opacity: 0.5;
+ visibility: hidden;
+ text-align: right;
+ margin: 5px;
+}
+#dropZone:hover{
+ cursor: grab;
+}
+#dropZone:active{
+ cursor: grabbing;
+}
+.visaUserConsigne{
+ width: 40%;
+}
+.visaUserAction{
+ color : red;
+ text-align: right;
+ width: 5%;
+}
+.visaUserAction i{
+ cursor: pointer;
}
\ No newline at end of file
diff --git a/modules/visa/js/functions.js b/modules/visa/js/functions.js
index d77e6295fe5a5d8cb65188323f2c82f680d57e86..60e051da9472c200390ae9d2efd1d0b96e21d2c0 100644
--- a/modules/visa/js/functions.js
+++ b/modules/visa/js/functions.js
@@ -5,12 +5,26 @@ function addVisaUser(users) {
next_visa = nb_visa + 1;
if(nb_visa == 0){
$j("#emptyVisa").hide();
- }else{
- $j("#visa_content").append('<div class="droptarget_arrow" id="visa_' + nb_visa + '_arrow" ><span><i class="fa fa-arrow-down" aria-hidden="true"></i></span></div>');
}
-
- $j("#visa_content").append('<div class="droptarget" id="visa_' + next_visa + '" draggable="true"><div class="delete_visa" onclick="delVisaUser(this.parentElement);"><i class="fa fa-trash" aria-hidden="true"></i></div><span style="float:left;"><i class="fa fa-user fa-2x" aria-hidden="true"></i> ' + $j("select#visaUserList option:selected").text() + ' <sup class="nbRes">'+$j("select#visaUserList option:selected").parent().get( 0 ).label+'</sup></span><span style="float:right;width:50%;"><input class="userId" type="hidden" value="' + $j("select#visaUserList option:selected").val() + '"/><input class="visaDate" type="hidden" value=""/><input type="text" class="consigne" value=""/></span><div style="clear:both;"></div></div>');
-
+ $j("#visa_content").append('<div class="droptarget" id="visa_' + next_visa + '" draggable="true">'
+ +'<span class="visaUserStatus">'
+ +'<i class="fa fa-hourglass" aria-hidden="true"></i>'
+ +'</span>'
+ +'<span class="visaUserInfo">'
+ +'<i class="fa fa-user fa-2x" aria-hidden="true"></i> '+ $j("select#visaUserList option:selected").text() +' <sup class="nbRes">'+$j("select#visaUserList option:selected").parent().get( 0 ).label+'</sup>'
+ +'<input class="userId" type="hidden" value="' + $j("select#visaUserList option:selected").val() + '"/><input class="visaDate" type="hidden" value=""/>'
+ +'</span>'
+ +'<span class="visaUserConsigne">'
+ +'<input type="text" class="consigne" value=""/>'
+ +'</span>'
+ +'<span class="visaUserAction">'
+ +'<i class="fa fa-trash" aria-hidden="true" onclick="delVisaUser(this.parentElement.parentElement);"></i>'
+ +'</span>'
+ +'<span id="dropZone">'
+ +'<i class="fa fa-exchange fa-2x fa-rotate-90" aria-hidden="true"></i>'
+ +'</span>'
+ +'</div>');
+
//prototype
document.getElementById("visaUserList").selectedIndex = 0;
Event.fire($("visaUserList"), "chosen:updated");
@@ -19,37 +33,43 @@ function addVisaUser(users) {
next_visa = nb_visa + 1;
if(nb_visa == 0){
$j("#emptyVisa").hide();
- }else{
- $j("#visa_content").append('<div class="droptarget_arrow" id="visa_' + nb_visa + '_arrow" ><span><i class="fa fa-arrow-down" aria-hidden="true"></i></span></div>');
}
- $j("#visa_content").append('<div class="droptarget" id="visa_' + next_visa + '" draggable="true"><div class="delete_visa" onclick="delVisaUser(this.parentElement);"><i class="fa fa-trash" aria-hidden="true"></i></div><span style="float:left;"><i class="fa fa-user fa-2x" aria-hidden="true"></i> ' + users.lastname + ' ' + users.firstname + ' <sup class="nbRes">' + users.entity_id + '</sup></span><span style="float:right;width:50%;"><input class="userId" type="hidden" value="' + users.user_id + '"/><input class="visaDate" type="hidden" value=""/><input type="text" class="consigne" value="' + users.process_comment + '"/></span><div style="clear:both;"></div></div>');
+ $j("#visa_content").append('<div class="droptarget" id="visa_' + next_visa + '" draggable="true">'
+ +'<span class="visaUserStatus">'
+ +'<i class="fa fa-hourglass" aria-hidden="true"></i>'
+ +'</span>'
+ +'<span class="visaUserInfo">'
+ +'<i class="fa fa-user fa-2x" aria-hidden="true"></i> ' + users.lastname + ' ' + users.firstname + ' <sup class="nbRes">'+users.entity_id+'</sup>'
+ +'<input class="userId" type="hidden" value="' + users.user_id + '"/><input class="visaDate" type="hidden" value=""/>'
+ +'</span>'
+ +'<span class="visaUserConsigne">'
+ +'<input type="text" class="consigne" value="' + users.process_comment + '"/>'
+ +'</span>'
+ +'<span class="visaUserAction">'
+ +'<i class="fa fa-trash" aria-hidden="true" onclick="delVisaUser(this.parentElement.parentElement);"></i>'
+ +'</span>'
+ +'<span id="dropZone">'
+ +'<i class="fa fa-exchange fa-2x fa-rotate-90" aria-hidden="true"></i>'
+ +'</span>'
+ +'</div>');
}
}
function delVisaUser (target) {
+ console.log(target);
var id = '#'+target.id;
-
- if($j(id+"_arrow").length){
- $j(id).remove();
- $j(id+"_arrow").remove();
- }else{
- console.log(target);
- if($j(".droptarget").length == 1){
- $j("#emptyVisa").show();
- }else{
- $j('#'+target.previousElementSibling.id).remove();
- }
- $j(id).remove();
+
+ if($j(".droptarget").length == 1){
+ $j("#emptyVisa").show();
}
+ $j(id).remove();
+
resetPosVisa();
}
function resetPosVisa () {
$i = 1;
$j(".droptarget").each(function() {
- if($j("#"+this.id+"_arrow").length){
- $j("#"+this.id+"_arrow").id= 'visa_' + $i + '_arrow';
- }
this.id = 'visa_' + $i;
$i++;
});