Merge branch 'dev' into 4077-login_recover-password

db/changes/10491-august/00-ACL_workerDisableExcluded.sql

@@ -0,0 +1,2 @@
+INSERT INTO `salix`.`ACL` (model,property,accessType,permission,principalId)
+	VALUES ('WorkerDisableExcluded','*','*','ALLOW','hr');

modules/worker/back/model-config.json

@@ -64,6 +64,9 @@
     },
     "WorkerTimeControlMail": {
         "dataSource": "vn"
+    },
+    "WorkerDisableExcluded": {
+        "dataSource": "vn"
     }
 }
 

modules/worker/back/models/workerDisableExcluded.json

@@ -0,0 +1,26 @@
+{
+	"name": "WorkerDisableExcluded",
+	"base": "VnModel",
+	"options": {
+		"mysql": {
+			"table": "workerDisableExcluded"
+		}
+	},
+	"properties": {
+		"workerFk": {
+			"id": true,
+			"type": "number"
+		},
+		"dated": {
+			"type": "date"
+		}
+	},
+	"acls": [
+        {
+        "accessType": "READ",
+        "principalType": "ROLE",
+        "principalId": "$everyone",
+        "permission": "ALLOW"
+        }
+    ]
+}

modules/worker/front/descriptor/index.html

@@ -14,6 +14,20 @@
             </vn-float-button>
         </div>
     </slot-before>
+    <slot-menu>
+         <vn-item
+            ng-click="$ctrl.handleExcluded()"
+            translate
+            ng-if="!$ctrl.excluded">
+            Click to exclude the user from getting disabled
+        </vn-item>
+        <vn-item
+            ng-click="$ctrl.handleExcluded()"
+            translate
+            ng-if="$ctrl.excluded">
+            Click to allow the user to be disabled 
+        </vn-item>
+    </slot-menu>
     <slot-body>
         <div class="attributes">
             <vn-label-value
@@ -37,6 +51,13 @@
                 value="{{$ctrl.worker.sip.extension}}">
             </vn-label-value>
         </div>
+        <div class="icons">
+            <vn-icon
+                vn-tooltip="This user can't be disabled"
+                icon="person"
+                ng-if="$ctrl.worker.excluded">
+            </vn-icon>
+        </div>
         <div class="quicklinks">
             <div ng-transclude="btnOne">
                 <vn-quick-link

modules/worker/front/descriptor/index.js

@@ -13,6 +13,33 @@ class Controller extends Descriptor {
 
     set worker(value) {
         this.entity = value;
+
+        if (value)
+            this.getIsExcluded();
+    }
+
+    get excluded() {
+        return this.entity.excluded;
+    }
+
+    set excluded(value) {
+        this.entity.excluded = value;
+    }
+
+    getIsExcluded() {
+        this.$http.get(`workerDisableExcludeds/${this.entity.id}/exists`).then(data => {
+            this.excluded = data.data.exists;
+        });
+    }
+
+    handleExcluded() {
+        if (this.excluded) {
+            this.$http.delete(`workerDisableExcludeds/${this.entity.id}`);
+            this.excluded = false;
+        } else {
+            this.$http.post(`workerDisableExcludeds`, {workerFk: this.entity.id, dated: new Date});
+            this.excluded = true;
+        }
     }
 
     loadData() {

modules/worker/front/locale/es.yml

@@ -20,4 +20,7 @@ View worker: Ver trabajador
 Worker id: Id trabajador
 Workers: Trabajadores
 worker: trabajador
-Go to the worker: Ir al trabajador
+Go to the worker: Ir al trabajador
+Click to exclude the user from getting disabled: Marcar para no deshabilitar
+Click to allow the user to be disabled: Marcar para deshabilitar
+This user can't be disabled: Fijado para no deshabilitar