dmencu 0.8.8 → 0.8.9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/client/client/client.js +3 -7
- package/dist/server/server/app-dmencu.js +6 -3
- package/dist/server/server/procedures-dmencu.js +117 -49
- package/dist/server/server/table-tareas.js +3 -2
- package/dist/server/server/table-tareas_tem_fin_campo.js +3 -2
- package/install/desverificar_tarea_trg.sql +12 -2
- package/package.json +2 -2
|
@@ -27,7 +27,8 @@
|
|
|
27
27
|
{ name: 'rol_recepcionista', typeName: 'text', visible: false },
|
|
28
28
|
{ name: 'main_form', typeName: 'text' },
|
|
29
29
|
{ name: 'registra_estado_en_tem', typeName: 'boolean' },
|
|
30
|
-
{ name: 'es_inicial', typeName: 'boolean' }
|
|
30
|
+
{ name: 'es_inicial', typeName: 'boolean' },
|
|
31
|
+
{ name: 'es_final', typeName: 'boolean' },
|
|
31
32
|
],
|
|
32
33
|
primaryKey: ['operativo', 'tarea'],
|
|
33
34
|
foreignKeys: [
|
|
@@ -44,4 +45,4 @@
|
|
|
44
45
|
}
|
|
45
46
|
exports.tareas = tareas;
|
|
46
47
|
});
|
|
47
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
48
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGFibGUtdGFyZWFzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3NlcnZlci90YWJsZS10YXJlYXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7O0lBQUEsWUFBWSxDQUFDOzs7SUFJYixTQUFnQixNQUFNLENBQUMsT0FBb0IsRUFBRSxJQUFTO1FBQ2xELElBQUksSUFBSSxHQUFDLElBQUksSUFBRSxFQUFFLENBQUM7UUFDbEIsSUFBSSxHQUFHLEdBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQSxDQUFDLENBQUEsTUFBTSxDQUFBLENBQUMsQ0FBQSxFQUFFLENBQUM7UUFDM0IsSUFBSSxFQUFFLEdBQUMsT0FBTyxDQUFDLEVBQUUsQ0FBQztRQUNsQixJQUFJLFdBQVcsR0FBRyxPQUFPLENBQUMsU0FBUyxDQUFDO1FBQ3BDLE9BQU87WUFDSCxJQUFJLEVBQUMsR0FBRyxHQUFHLFFBQVE7WUFDbkIsU0FBUyxFQUFDLFFBQVE7WUFDbEIsV0FBVyxFQUFDLE9BQU87WUFDbkIsUUFBUSxFQUFDLFdBQVc7WUFDcEIsTUFBTSxFQUFDO2dCQUNILEVBQUMsSUFBSSxFQUFDLFdBQVcsRUFBaUIsUUFBUSxFQUFDLE1BQU0sRUFBQztnQkFDbEQsRUFBQyxJQUFJLEVBQUMsT0FBTyxFQUFxQixRQUFRLEVBQUMsTUFBTSxFQUFDO2dCQUNsRCxFQUFDLElBQUksRUFBQyxRQUFRLEVBQW9CLFFBQVEsRUFBQyxNQUFNLEVBQUM7Z0JBQ2xELEVBQUMsSUFBSSxFQUFDLG1CQUFtQixFQUFTLFFBQVEsRUFBQyxNQUFNLEVBQUUsT0FBTyxFQUFDLEtBQUssRUFBQztnQkFDakUsRUFBQyxJQUFJLEVBQUMsV0FBVyxFQUFpQixRQUFRLEVBQUMsTUFBTSxFQUFDO2dCQUNsRCxFQUFDLElBQUksRUFBQyx3QkFBd0IsRUFBSSxRQUFRLEVBQUMsU0FBUyxFQUFDO2dCQUNyRCxFQUFDLElBQUksRUFBQyxZQUFZLEVBQWdCLFFBQVEsRUFBQyxTQUFTLEVBQUM7Z0JBQ3JELEVBQUMsSUFBSSxFQUFDLFVBQVUsRUFBa0IsUUFBUSxFQUFDLFNBQVMsRUFBQzthQUN4RDtZQUNELFVBQVUsRUFBQyxDQUFDLFdBQVcsRUFBQyxPQUFPLENBQUM7WUFDaEMsV0FBVyxFQUFDO2dCQUNSLEVBQUMsVUFBVSxFQUFDLFlBQVksRUFBRyxNQUFNLEVBQUMsQ0FBQyxXQUFXLENBQUMsRUFBQzthQUNuRDtZQUNELFlBQVksRUFBQztnQkFDVCxFQUFDLEtBQUssRUFBQyxHQUFHLEdBQUcsY0FBYyxFQUFPLE1BQU0sRUFBQyxDQUFDLFdBQVcsRUFBQyxPQUFPLENBQUMsRUFBRSxHQUFHLEVBQUMsR0FBRyxFQUFDO2dCQUN4RSxFQUFDLEtBQUssRUFBQyxHQUFHLEdBQUcsWUFBWSxFQUFTLE1BQU0sRUFBQyxDQUFDLFdBQVcsRUFBQyxPQUFPLENBQUMsRUFBRSxHQUFHLEVBQUMsR0FBRyxFQUFDO2FBQzNFO1lBQ0QsR0FBRyxFQUFDO2dCQUNBLE9BQU8sRUFBQyxDQUFDLElBQUksQ0FBQyxHQUFHO2FBQ3BCO1NBQ0osQ0FBQztJQUNOLENBQUM7SUFoQ0Qsd0JBZ0NDIiwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XHJcblxyXG5pbXBvcnQge1RhYmxlRGVmaW5pdGlvbiwgVGFibGVDb250ZXh0fSBmcm9tIFwiLi90eXBlcy1kbWVuY3VcIjtcclxuXHJcbmV4cG9ydCBmdW5jdGlvbiB0YXJlYXMoY29udGV4dDpUYWJsZUNvbnRleHQsIG9wdHM/OmFueSk6VGFibGVEZWZpbml0aW9uIHtcclxuICAgIHZhciBvcHRzPW9wdHN8fHt9O1xyXG4gICAgdmFyIG1pcz1vcHRzLm1pcz8nbWlzXyc6Jyc7XHJcbiAgICB2YXIgYmU9Y29udGV4dC5iZTtcclxuICAgIHZhciBwdWVkZUVkaXRhciA9IGNvbnRleHQuc3VwZXJ1c2VyO1xyXG4gICAgcmV0dXJuIHtcclxuICAgICAgICBuYW1lOmAke21pc310YXJlYXNgLFxyXG4gICAgICAgIHRhYmxlTmFtZTpgdGFyZWFzYCxcclxuICAgICAgICBlbGVtZW50TmFtZTondGFyZWEnLFxyXG4gICAgICAgIGVkaXRhYmxlOnB1ZWRlRWRpdGFyLFxyXG4gICAgICAgIGZpZWxkczpbXHJcbiAgICAgICAgICAgIHtuYW1lOidvcGVyYXRpdm8nICAgICAgICAgICAgICAgLCB0eXBlTmFtZTondGV4dCd9LFxyXG4gICAgICAgICAgICB7bmFtZTondGFyZWEnICAgICAgICAgICAgICAgICAgICwgdHlwZU5hbWU6J3RleHQnfSxcclxuICAgICAgICAgICAge25hbWU6J25vbWJyZScgICAgICAgICAgICAgICAgICAsIHR5cGVOYW1lOid0ZXh0J30sXHJcbiAgICAgICAgICAgIHtuYW1lOidyb2xfcmVjZXBjaW9uaXN0YScgICAgICAgLCB0eXBlTmFtZTondGV4dCcsIHZpc2libGU6ZmFsc2V9LFxyXG4gICAgICAgICAgICB7bmFtZTonbWFpbl9mb3JtJyAgICAgICAgICAgICAgICwgdHlwZU5hbWU6J3RleHQnfSxcclxuICAgICAgICAgICAge25hbWU6J3JlZ2lzdHJhX2VzdGFkb19lbl90ZW0nICAsIHR5cGVOYW1lOidib29sZWFuJ30sXHJcbiAgICAgICAgICAgIHtuYW1lOidlc19pbmljaWFsJyAgICAgICAgICAgICAgLCB0eXBlTmFtZTonYm9vbGVhbid9LFxyXG4gICAgICAgICAgICB7bmFtZTonZXNfZmluYWwnICAgICAgICAgICAgICAgICwgdHlwZU5hbWU6J2Jvb2xlYW4nfSxcclxuICAgICAgICBdLFxyXG4gICAgICAgIHByaW1hcnlLZXk6WydvcGVyYXRpdm8nLCd0YXJlYSddLFxyXG4gICAgICAgIGZvcmVpZ25LZXlzOltcclxuICAgICAgICAgICAge3JlZmVyZW5jZXM6J29wZXJhdGl2b3MnICwgZmllbGRzOlsnb3BlcmF0aXZvJ119LFxyXG4gICAgICAgIF0sICAgICAgICBcclxuICAgICAgICBkZXRhaWxUYWJsZXM6W1xyXG4gICAgICAgICAgICB7dGFibGU6YCR7bWlzfXRhcmVhc19hcmVhc2AgICAgICwgZmllbGRzOlsnb3BlcmF0aXZvJywndGFyZWEnXSwgYWJyOidBJ30sXHJcbiAgICAgICAgICAgIHt0YWJsZTpgJHttaXN9dGFyZWFzX3RlbWAgICAgICAgLCBmaWVsZHM6WydvcGVyYXRpdm8nLCd0YXJlYSddLCBhYnI6J0UnfSxcclxuICAgICAgICBdLFxyXG4gICAgICAgIHNxbDp7XHJcbiAgICAgICAgICAgIGlzVGFibGU6IW9wdHMubWlzXHJcbiAgICAgICAgfVxyXG4gICAgfTtcclxufVxyXG5cclxuIl19
|
|
@@ -20,7 +20,8 @@
|
|
|
20
20
|
.forEach((field) => field.visible = false);
|
|
21
21
|
tableDef.hiddenColumns = (_a = tableDef.hiddenColumns) === null || _a === void 0 ? void 0 : _a.concat(['asignado__nombre', 'asignado__apellido',
|
|
22
22
|
'rec__nombre', 'rec__apellido']);
|
|
23
|
-
tableDef.
|
|
23
|
+
tableDef.selfRefresh = true;
|
|
24
|
+
tableDef.refrescable = true;
|
|
24
25
|
};
|
|
25
26
|
exports.definicionComunFincAnacProc = definicionComunFincAnacProc;
|
|
26
27
|
function tareas_tem_fin_campo(context) {
|
|
@@ -40,4 +41,4 @@
|
|
|
40
41
|
}
|
|
41
42
|
exports.tareas_tem_fin_campo = tareas_tem_fin_campo;
|
|
42
43
|
});
|
|
43
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
44
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGFibGUtdGFyZWFzX3RlbV9maW5fY2FtcG8uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvc2VydmVyL3RhYmxlLXRhcmVhc190ZW1fZmluX2NhbXBvLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7OztJQUFBLFlBQVksQ0FBQzs7O0lBSWIseURBQStDO0lBQy9DLDZFQUFnRjtJQUV6RSxJQUFJLDJCQUEyQixHQUFHLENBQUMsUUFBd0IsRUFBQyxFQUFFOztRQUNqRSxRQUFRLENBQUMsNEJBQTRCLEdBQUMsSUFBSSxDQUFDO1FBQzNDLFFBQVEsQ0FBQyxNQUFNO2FBQ1YsTUFBTSxDQUFDLENBQUMsS0FBcUIsRUFBQyxFQUFFLENBQUEsQ0FBQyxlQUFlLEVBQUMsVUFBVSxDQUFDLENBQUMsUUFBUSxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsQ0FBQzthQUNsRixPQUFPLENBQUMsQ0FBQyxLQUFxQixFQUFDLEVBQUUsQ0FBQSxLQUFLLENBQUMsT0FBTyxHQUFDLEtBQUssQ0FBQyxDQUFBO1FBQzFELFFBQVEsQ0FBQyxhQUFhLEdBQUMsTUFBQSxRQUFRLENBQUMsYUFBYSwwQ0FBRSxNQUFNLENBQUMsQ0FBQyxrQkFBa0IsRUFBQyxvQkFBb0I7WUFDckYsYUFBYSxFQUFDLGVBQWUsQ0FBQyxDQUFDLENBQUM7UUFDekMsUUFBUSxDQUFDLFdBQVcsR0FBRyxJQUFJLENBQUM7UUFDNUIsUUFBUSxDQUFDLFdBQVcsR0FBRyxJQUFJLENBQUM7SUFDaEMsQ0FBQyxDQUFBO0lBVFUsUUFBQSwyQkFBMkIsK0JBU3JDO0lBRUQsU0FBZ0Isb0JBQW9CLENBQUMsT0FBb0I7UUFDckQsSUFBSSxRQUFRLEdBQUcsSUFBQSxpREFBb0IsRUFBQyxPQUFPLEVBQUUsRUFBQyxHQUFHLEVBQUUsSUFBSSxFQUFFLElBQUksRUFBRSxXQUFXLEVBQUUsUUFBUSxFQUFFLEtBQUssRUFBQyxDQUFDLENBQUM7UUFDOUYsUUFBUSxDQUFDLElBQUksR0FBRyxzQkFBc0IsQ0FBQztRQUN2QyxRQUFRLENBQUMsYUFBYSxHQUFDO1lBQ25CLEVBQUMsTUFBTSxFQUFDLHNCQUFzQixFQUFFLFFBQVEsRUFBQyxHQUFHLEVBQUUsS0FBSyxFQUFDLElBQUksRUFBQztTQUM1RCxDQUFDO1FBQ0YsSUFBQSxtQ0FBMkIsRUFBQyxRQUFRLENBQUMsQ0FBQztRQUN0QyxRQUFRLENBQUMsTUFBTTthQUNWLE1BQU0sQ0FBQyxDQUFDLEtBQUssRUFBQyxFQUFFLENBQUEsQ0FBQyxXQUFXLEVBQUMsY0FBYyxFQUFDLE9BQU8sQ0FBQyxDQUFDLFFBQVEsQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLENBQUM7YUFDMUUsT0FBTyxDQUFDLENBQUMsS0FBSyxFQUFDLEVBQUUsQ0FBQSxLQUFLLENBQUMsT0FBTyxHQUFDLElBQUksQ0FBQyxDQUFDO1FBQzFDLElBQUksVUFBVSxHQUFHLElBQUEsNkJBQVUsRUFBQyxPQUFPLENBQUMsQ0FBQztRQUNyQyxRQUFRLENBQUMsR0FBSSxDQUFDLElBQUksR0FBQyxJQUFBLHVDQUFVLEVBQUMsVUFBVSxFQUFDLEVBQUMsS0FBSyxFQUFDLFdBQVcsRUFBQyxDQUFDLENBQUM7UUFDOUQsUUFBUSxDQUFDLEdBQUksQ0FBQyxLQUFLLEdBQUcsNkRBQTZELENBQUM7UUFDcEYsT0FBTyxRQUFRLENBQUM7SUFDcEIsQ0FBQztJQWRELG9EQWNDIiwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XHJcblxyXG5pbXBvcnQge1RhYmxlRGVmaW5pdGlvbiwgVGFibGVDb250ZXh0LCBGaWVsZERlZmluaXRpb24sIGdldERvbWljaWxpb0ZpZWxkc30gZnJvbSBcIi4vdHlwZXMtZG1lbmN1XCI7XHJcblxyXG5pbXBvcnQge3RhcmVhc190ZW0gfSBmcm9tIFwiLi90YWJsZS10YXJlYXNfdGVtXCI7XHJcbmltcG9ydCB7IGdldFNxbEZyb20sIHRhcmVhc190ZW1fcmVjZXBjaW9uIH0gZnJvbSBcIi4vdGFibGUtdGFyZWFzX3RlbV9yZWNlcGNpb25cIjtcclxuXHJcbmV4cG9ydCB2YXIgZGVmaW5pY2lvbkNvbXVuRmluY0FuYWNQcm9jID0gKHRhYmxlRGVmOlRhYmxlRGVmaW5pdGlvbik9PntcclxuICAgIHRhYmxlRGVmLm11ZXN0cmFBYnJpckVuVG9kYXNMYXNUYXJlYXM9dHJ1ZTtcclxuICAgIHRhYmxlRGVmLmZpZWxkc1xyXG4gICAgICAgIC5maWx0ZXIoKGZpZWxkOkZpZWxkRGVmaW5pdGlvbik9PlsncmVjZXBjaW9uaXN0YScsJ2FzaWduYWRvJ10uaW5jbHVkZXMoZmllbGQubmFtZSkpXHJcbiAgICAgICAgLmZvckVhY2goKGZpZWxkOkZpZWxkRGVmaW5pdGlvbik9PmZpZWxkLnZpc2libGU9ZmFsc2UpXHJcbiAgICB0YWJsZURlZi5oaWRkZW5Db2x1bW5zPXRhYmxlRGVmLmhpZGRlbkNvbHVtbnM/LmNvbmNhdChbJ2FzaWduYWRvX19ub21icmUnLCdhc2lnbmFkb19fYXBlbGxpZG8nLFxyXG4gICAgICAgICAgICAgJ3JlY19fbm9tYnJlJywncmVjX19hcGVsbGlkbyddKTtcclxuICAgIHRhYmxlRGVmLnNlbGZSZWZyZXNoID0gdHJ1ZTtcclxuICAgIHRhYmxlRGVmLnJlZnJlc2NhYmxlID0gdHJ1ZTtcclxufVxyXG5cclxuZXhwb3J0IGZ1bmN0aW9uIHRhcmVhc190ZW1fZmluX2NhbXBvKGNvbnRleHQ6VGFibGVDb250ZXh0KTpUYWJsZURlZmluaXRpb24ge1xyXG4gICAgbGV0IHRhYmxlRGVmID0gdGFyZWFzX3RlbV9yZWNlcGNpb24oY29udGV4dCwge3JvbDogbnVsbCwgbmFtZTogJ3JlbGV2YWRvcicsIGNvbnNpc3RlOiBmYWxzZX0pO1xyXG4gICAgdGFibGVEZWYubmFtZSA9IGB0YXJlYXNfdGVtX2Zpbl9jYW1wb2A7XHJcbiAgICB0YWJsZURlZi5maWx0ZXJDb2x1bW5zPVtcclxuICAgICAgICB7Y29sdW1uOid2aXNpYmxlX2VuX2Zpbl9jYW1wbycsIG9wZXJhdG9yOic9JywgdmFsdWU6dHJ1ZX1cclxuICAgIF07XHJcbiAgICBkZWZpbmljaW9uQ29tdW5GaW5jQW5hY1Byb2ModGFibGVEZWYpO1xyXG4gICAgdGFibGVEZWYuZmllbGRzXHJcbiAgICAgICAgLmZpbHRlcigoZmllbGQpPT5bJ2FkZWxhbnRhcicsJ2RpYXNfYV9wYXNhcicsJ3Byb2llJ10uaW5jbHVkZXMoZmllbGQubmFtZSkpXHJcbiAgICAgICAgLmZvckVhY2goKGZpZWxkKT0+ZmllbGQudmlzaWJsZT10cnVlKTtcclxuICAgIHZhciB0YWJsZURlZlRUID0gdGFyZWFzX3RlbShjb250ZXh0KTtcclxuICAgIHRhYmxlRGVmLnNxbCEuZnJvbT1nZXRTcWxGcm9tKHRhYmxlRGVmVFQse2Rlc2RlOlwiZmluX2NhbXBvXCJ9KTtcclxuICAgIHRhYmxlRGVmLnNxbCEud2hlcmUgPSBgXCJ0YXJlYXNfdGVtXCIudGFyZWEgPSAnZmluYycgYW5kIFwidGVtXCIudGFyZWFfYWN0dWFsID0gJ2ZpbmMnYDtcclxuICAgIHJldHVybiB0YWJsZURlZjtcclxufSJdfQ==
|
|
@@ -8,9 +8,11 @@ AS $BODY$
|
|
|
8
8
|
declare
|
|
9
9
|
v_asignado_actual text;
|
|
10
10
|
v_tarea_actual text;
|
|
11
|
+
v_verificado_actual text;
|
|
11
12
|
v_ultima_tarea_historial text;
|
|
13
|
+
v_tarea_final text;
|
|
12
14
|
begin
|
|
13
|
-
select asignado, tarea_actual into v_asignado_actual, v_tarea_actual
|
|
15
|
+
select asignado, tarea_actual, verificado into v_asignado_actual, v_tarea_actual, v_verificado_actual
|
|
14
16
|
from tareas_tem tt join tem t using (operativo, enc)
|
|
15
17
|
where new.operativo = t.operativo and new.enc = t.enc and tt.tarea = t.tarea_actual;
|
|
16
18
|
|
|
@@ -19,8 +21,14 @@ begin
|
|
|
19
21
|
where new.operativo = ht.operativo and new.enc = ht.enc
|
|
20
22
|
order by ts_salida desc
|
|
21
23
|
limit 1;
|
|
24
|
+
select tarea into v_tarea_final
|
|
25
|
+
from tareas
|
|
26
|
+
where operativo = new.operativo and es_final;
|
|
22
27
|
if new.verificado is null then
|
|
23
28
|
if v_ultima_tarea_historial = new.tarea then
|
|
29
|
+
if v_verificado_actual is not null then
|
|
30
|
+
raise 'ERROR: no se puede desverificar la tarea % ya que la tarea siguiente (%) se encuentra verificada', new.tarea, v_tarea_actual;
|
|
31
|
+
end if;
|
|
24
32
|
if v_asignado_actual is null then
|
|
25
33
|
update tem
|
|
26
34
|
set tarea_actual = new.tarea
|
|
@@ -29,7 +37,9 @@ begin
|
|
|
29
37
|
raise 'ERROR: no se puede desverificar la tarea % ya que la tarea siguiente (%) se encuentra asignada', new.tarea, v_tarea_actual;
|
|
30
38
|
end if;
|
|
31
39
|
else
|
|
32
|
-
|
|
40
|
+
if v_tarea_final is distinct from new.tarea then
|
|
41
|
+
raise 'ERROR: no se puede desverificar la tarea % ya que no es la ultima anterior a la actual', new.tarea;
|
|
42
|
+
end if;
|
|
33
43
|
end if;
|
|
34
44
|
end if;
|
|
35
45
|
return new;
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "dmencu",
|
|
3
3
|
"description": "DM Encu - Encuestas en dispositivo móvil",
|
|
4
|
-
"version": "0.8.
|
|
4
|
+
"version": "0.8.9",
|
|
5
5
|
"author": "Codenautas <codenautas@googlegroups.com>",
|
|
6
6
|
"license": "MIT",
|
|
7
7
|
"main": "dist/server/server/app-dmencu.js",
|
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
"memoize-one": "~6.0.0",
|
|
16
16
|
"meta-enc": "^1.4.9",
|
|
17
17
|
"procesamiento": "^1.0.10",
|
|
18
|
-
"backend-plus": "^2.0.0-rc.
|
|
18
|
+
"backend-plus": "^2.0.0-rc.6",
|
|
19
19
|
"qrcode": "^1.5.3",
|
|
20
20
|
"react": "~17.0.2",
|
|
21
21
|
"react-dom": "~17.0.2",
|