dmencu 0.3.30 → 0.3.32
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.
|
@@ -15,7 +15,6 @@
|
|
|
15
15
|
tableDef.fields.forEach((field) => field.table = 'tareas_tem');
|
|
16
16
|
//tableDef.selfRefresh = true;
|
|
17
17
|
tableDef.refrescable = true;
|
|
18
|
-
//tableDef.primaryKey = ['operativo','enc'];
|
|
19
18
|
tableDef.sql.isTable = false;
|
|
20
19
|
return tableDef;
|
|
21
20
|
}
|
|
@@ -40,13 +39,15 @@
|
|
|
40
39
|
tableDef.name = `tareas_tem_recepcion`;
|
|
41
40
|
tableDef.fields.splice(4, 0, { name: "acciones", typeName: 'jsonb', editable: false, inTable: false }, { name: "acciones_avance", typeName: 'text', editable: false, inTable: false, clientSide: 'accionesAvance' }, { name: "acciones_retroceso", typeName: 'text', editable: false, inTable: false, clientSide: 'accionesRetroceso' }, { name: "acciones_blanqueo", typeName: 'text', editable: false, inTable: false, clientSide: 'accionesBlanqueo' }, { name: "visible_en_asignacion", typeName: "boolean", editable: false, inTable: false, visible: false }, { name: "visible_en_recepcion", typeName: "boolean", editable: false, inTable: false, visible: false });
|
|
42
41
|
setCommonDefinition(tableDef);
|
|
42
|
+
tableDef.primaryKey = ['operativo', 'enc'];
|
|
43
43
|
tableDef.filterColumns = [
|
|
44
44
|
{ column: 'visible_en_recepcion', operator: '=', value: true }
|
|
45
45
|
];
|
|
46
46
|
tableDef.hiddenColumns = ['cargado_dm', 'notas', 'acciones', 'fecha_asignacion'];
|
|
47
47
|
checkMyActions(tableDef, 'recepciona');
|
|
48
|
+
tableDef.sql.where = `"tem".tarea_actual="tareas_tem".tarea`;
|
|
48
49
|
return tableDef;
|
|
49
50
|
}
|
|
50
51
|
exports.tareas_tem_recepcion = tareas_tem_recepcion;
|
|
51
52
|
});
|
|
52
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
53
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGFibGUtdGFyZWFzX3RlbV9yZWNlcGNpb24uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvc2VydmVyL3RhYmxlLXRhcmVhc190ZW1fcmVjZXBjaW9uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7OztJQUFBLFlBQVksQ0FBQzs7O0lBSWIseURBQThDO0lBRTlDLFNBQWdCLG1CQUFtQixDQUFDLFFBQXdCO1FBQ3hELFFBQVEsQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLENBQUMsS0FBcUIsRUFBQyxFQUFFLENBQUEsS0FBSyxDQUFDLEtBQUssR0FBQyxZQUFZLENBQUMsQ0FBQztRQUMzRSw4QkFBOEI7UUFDOUIsUUFBUSxDQUFDLFdBQVcsR0FBRyxJQUFJLENBQUM7UUFDNUIsUUFBUSxDQUFDLEdBQUksQ0FBQyxPQUFPLEdBQUcsS0FBSyxDQUFDO1FBQzlCLE9BQU8sUUFBUSxDQUFBO0lBQ25CLENBQUM7SUFORCxrREFNQztJQUVELFNBQWdCLGNBQWMsQ0FBQyxRQUF3QixFQUFFLE9BQWM7UUFDbkUsUUFBUSxDQUFDLEdBQUksQ0FBQyxJQUFJLEdBQUMsbUJBQW1CLFFBQVEsQ0FBQyxHQUFJLENBQUMsSUFBSTs7Ozs7OytGQU1tQyxPQUFPOzs7OztVQUs1RixDQUFBO0lBQ1YsQ0FBQztJQWJELHdDQWFDO0lBRUQsU0FBZ0Isb0JBQW9CLENBQUMsT0FBb0I7UUFDckQsSUFBSSxRQUFRLEdBQUcsSUFBQSw2QkFBVSxFQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQ25DLFFBQVEsQ0FBQyxJQUFJLEdBQUcsc0JBQXNCLENBQUM7UUFDdkMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUMsQ0FBQyxFQUFDLENBQUMsRUFDdEIsRUFBQyxJQUFJLEVBQUMsVUFBVSxFQUFzQixRQUFRLEVBQUUsT0FBTyxFQUFRLFFBQVEsRUFBQyxLQUFLLEVBQUssT0FBTyxFQUFDLEtBQUssRUFBQyxFQUNoRyxFQUFDLElBQUksRUFBQyxpQkFBaUIsRUFBZSxRQUFRLEVBQUUsTUFBTSxFQUFTLFFBQVEsRUFBQyxLQUFLLEVBQUssT0FBTyxFQUFDLEtBQUssRUFBRSxVQUFVLEVBQUMsZ0JBQWdCLEVBQUMsRUFDN0gsRUFBQyxJQUFJLEVBQUMsb0JBQW9CLEVBQVksUUFBUSxFQUFFLE1BQU0sRUFBUyxRQUFRLEVBQUMsS0FBSyxFQUFLLE9BQU8sRUFBQyxLQUFLLEVBQUUsVUFBVSxFQUFDLG1CQUFtQixFQUFDLEVBQ2hJLEVBQUMsSUFBSSxFQUFDLG1CQUFtQixFQUFhLFFBQVEsRUFBRSxNQUFNLEVBQVMsUUFBUSxFQUFDLEtBQUssRUFBSyxPQUFPLEVBQUMsS0FBSyxFQUFFLFVBQVUsRUFBQyxrQkFBa0IsRUFBQyxFQUMvSCxFQUFDLElBQUksRUFBQyx1QkFBdUIsRUFBUyxRQUFRLEVBQUUsU0FBUyxFQUFNLFFBQVEsRUFBQyxLQUFLLEVBQUssT0FBTyxFQUFDLEtBQUssRUFBRSxPQUFPLEVBQUMsS0FBSyxFQUFDLEVBQy9HLEVBQUMsSUFBSSxFQUFDLHNCQUFzQixFQUFVLFFBQVEsRUFBRSxTQUFTLEVBQU0sUUFBUSxFQUFDLEtBQUssRUFBSyxPQUFPLEVBQUMsS0FBSyxFQUFFLE9BQU8sRUFBQyxLQUFLLEVBQUMsQ0FDbEgsQ0FBQztRQUNGLG1CQUFtQixDQUFDLFFBQVEsQ0FBQyxDQUFDO1FBQzlCLFFBQVEsQ0FBQyxVQUFVLEdBQUcsQ0FBQyxXQUFXLEVBQUMsS0FBSyxDQUFDLENBQUM7UUFDMUMsUUFBUSxDQUFDLGFBQWEsR0FBQztZQUNuQixFQUFDLE1BQU0sRUFBQyxzQkFBc0IsRUFBRSxRQUFRLEVBQUMsR0FBRyxFQUFFLEtBQUssRUFBQyxJQUFJLEVBQUM7U0FDNUQsQ0FBQztRQUNGLFFBQVEsQ0FBQyxhQUFhLEdBQUMsQ0FBQyxZQUFZLEVBQUMsT0FBTyxFQUFFLFVBQVUsRUFBQyxrQkFBa0IsQ0FBQyxDQUFDO1FBQzdFLGNBQWMsQ0FBQyxRQUFRLEVBQUMsWUFBWSxDQUFDLENBQUM7UUFDdEMsUUFBUSxDQUFDLEdBQUksQ0FBQyxLQUFLLEdBQUcsdUNBQXVDLENBQUM7UUFDOUQsT0FBTyxRQUFRLENBQUE7SUFDbkIsQ0FBQztJQXBCRCxvREFvQkMiLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcclxuXHJcbmltcG9ydCB7VGFibGVEZWZpbml0aW9uLCBUYWJsZUNvbnRleHQsIEZpZWxkRGVmaW5pdGlvbn0gZnJvbSBcIi4vdHlwZXMtZG1lbmN1XCI7XHJcblxyXG5pbXBvcnQge3RhcmVhc190ZW19IGZyb20gXCIuL3RhYmxlLXRhcmVhc190ZW1cIjtcclxuXHJcbmV4cG9ydCBmdW5jdGlvbiBzZXRDb21tb25EZWZpbml0aW9uKHRhYmxlRGVmOlRhYmxlRGVmaW5pdGlvbil7XHJcbiAgICB0YWJsZURlZi5maWVsZHMuZm9yRWFjaCgoZmllbGQ6RmllbGREZWZpbml0aW9uKT0+ZmllbGQudGFibGU9J3RhcmVhc190ZW0nKTtcclxuICAgIC8vdGFibGVEZWYuc2VsZlJlZnJlc2ggPSB0cnVlO1xyXG4gICAgdGFibGVEZWYucmVmcmVzY2FibGUgPSB0cnVlO1xyXG4gICAgdGFibGVEZWYuc3FsIS5pc1RhYmxlID0gZmFsc2U7XHJcbiAgICByZXR1cm4gdGFibGVEZWZcclxufVxyXG5cclxuZXhwb3J0IGZ1bmN0aW9uIGNoZWNrTXlBY3Rpb25zKHRhYmxlRGVmOlRhYmxlRGVmaW5pdGlvbiwgbXlGaWVsZDpzdHJpbmcpe1xyXG4gICAgdGFibGVEZWYuc3FsIS5mcm9tPWAoc2VsZWN0ICogZnJvbSAoJHt0YWJsZURlZi5zcWwhLmZyb219KSBhdXhcclxuICAgICAgICAsIGxhdGVyYWwgKFxyXG4gICAgICAgICAgICBzZWxlY3QganNvbmJfYWdnKHouKikgYXMgYWNjaW9uZXNcclxuICAgICAgICAgICAgICAgIGZyb20gKFxyXG4gICAgICAgICAgICAgICAgICAgIHNlbGVjdCBlYS4qLCBhYy5wYXRoX2ljb25vX3N2ZywgYWMuZGVzYWN0aXZhX2JvdG9uLCBhYy5jb25maXJtYVxyXG4gICAgICAgICAgICAgICAgICAgICAgICBmcm9tIGVzdGFkb3NfYWNjaW9uZXMgZWEgam9pbiBhY2Npb25lcyBhYyB1c2luZyAob3BlcmF0aXZvLCBlYWNjaW9uKVxyXG4gICAgICAgICAgICAgICAgICAgICAgICB3aGVyZSBlYS5vcGVyYXRpdm8gPSBhdXgub3BlcmF0aXZvIGFuZCBlYS5lc3RhZG8gPSBhdXguZXN0YWRvIGFuZCBhYy4ke215RmllbGR9XHJcbiAgICAgICAgICAgICAgICAgICAgICAgIGFuZCBhY2Npb25fY3VtcGxlX2NvbmRpY2lvbihhdXgub3BlcmF0aXZvLCBlYS5lc3RhZG8sIGF1eC5lbmMsIGVhLmVhY2Npb24sIGVhLmNvbmRpY2lvbilcclxuICAgICAgICAgICAgICAgICAgICBvcmRlciBieSBhYy5lYWNjaW9uXHJcbiAgICAgICAgICAgICAgICApIHpcclxuICAgICAgICAgICAgKSB5XHJcbiAgICAgICAgKWBcclxufVxyXG5cclxuZXhwb3J0IGZ1bmN0aW9uIHRhcmVhc190ZW1fcmVjZXBjaW9uKGNvbnRleHQ6VGFibGVDb250ZXh0KTpUYWJsZURlZmluaXRpb24ge1xyXG4gICAgdmFyIHRhYmxlRGVmID0gdGFyZWFzX3RlbShjb250ZXh0KTtcclxuICAgIHRhYmxlRGVmLm5hbWUgPSBgdGFyZWFzX3RlbV9yZWNlcGNpb25gO1xyXG4gICAgdGFibGVEZWYuZmllbGRzLnNwbGljZSg0LDAsXHJcbiAgICAgICAge25hbWU6XCJhY2Npb25lc1wiICAgICAgICAgICAgICAgICAgICAsIHR5cGVOYW1lOiAnanNvbmInICAgICAgLCBlZGl0YWJsZTpmYWxzZSAgICwgaW5UYWJsZTpmYWxzZX0sXHJcbiAgICAgICAge25hbWU6XCJhY2Npb25lc19hdmFuY2VcIiAgICAgICAgICAgICAsIHR5cGVOYW1lOiAndGV4dCcgICAgICAgLCBlZGl0YWJsZTpmYWxzZSAgICwgaW5UYWJsZTpmYWxzZSwgY2xpZW50U2lkZTonYWNjaW9uZXNBdmFuY2UnfSxcclxuICAgICAgICB7bmFtZTpcImFjY2lvbmVzX3JldHJvY2Vzb1wiICAgICAgICAgICwgdHlwZU5hbWU6ICd0ZXh0JyAgICAgICAsIGVkaXRhYmxlOmZhbHNlICAgLCBpblRhYmxlOmZhbHNlLCBjbGllbnRTaWRlOidhY2Npb25lc1JldHJvY2Vzbyd9LFxyXG4gICAgICAgIHtuYW1lOlwiYWNjaW9uZXNfYmxhbnF1ZW9cIiAgICAgICAgICAgLCB0eXBlTmFtZTogJ3RleHQnICAgICAgICwgZWRpdGFibGU6ZmFsc2UgICAsIGluVGFibGU6ZmFsc2UsIGNsaWVudFNpZGU6J2FjY2lvbmVzQmxhbnF1ZW8nfSxcclxuICAgICAgICB7bmFtZTpcInZpc2libGVfZW5fYXNpZ25hY2lvblwiICAgICAgICwgdHlwZU5hbWU6IFwiYm9vbGVhblwiICAgICwgZWRpdGFibGU6ZmFsc2UgICAsIGluVGFibGU6ZmFsc2UsIHZpc2libGU6ZmFsc2V9LFxyXG4gICAgICAgIHtuYW1lOlwidmlzaWJsZV9lbl9yZWNlcGNpb25cIiAgICAgICAgLCB0eXBlTmFtZTogXCJib29sZWFuXCIgICAgLCBlZGl0YWJsZTpmYWxzZSAgICwgaW5UYWJsZTpmYWxzZSwgdmlzaWJsZTpmYWxzZX0sXHJcbiAgICApO1xyXG4gICAgc2V0Q29tbW9uRGVmaW5pdGlvbih0YWJsZURlZik7XHJcbiAgICB0YWJsZURlZi5wcmltYXJ5S2V5ID0gWydvcGVyYXRpdm8nLCdlbmMnXTtcclxuICAgIHRhYmxlRGVmLmZpbHRlckNvbHVtbnM9W1xyXG4gICAgICAgIHtjb2x1bW46J3Zpc2libGVfZW5fcmVjZXBjaW9uJywgb3BlcmF0b3I6Jz0nLCB2YWx1ZTp0cnVlfVxyXG4gICAgXTtcclxuICAgIHRhYmxlRGVmLmhpZGRlbkNvbHVtbnM9WydjYXJnYWRvX2RtJywnbm90YXMnLCAnYWNjaW9uZXMnLCdmZWNoYV9hc2lnbmFjaW9uJ107XHJcbiAgICBjaGVja015QWN0aW9ucyh0YWJsZURlZiwncmVjZXBjaW9uYScpO1xyXG4gICAgdGFibGVEZWYuc3FsIS53aGVyZSA9IGBcInRlbVwiLnRhcmVhX2FjdHVhbD1cInRhcmVhc190ZW1cIi50YXJlYWA7XHJcbiAgICByZXR1cm4gdGFibGVEZWZcclxufVxyXG5cclxuIl19
|
|
@@ -2,6 +2,8 @@
|
|
|
2
2
|
--set search_path=base;
|
|
3
3
|
|
|
4
4
|
DROP FUNCTION if exists validar_tareas_tem_trg();
|
|
5
|
+
set search_path = base;
|
|
6
|
+
|
|
5
7
|
CREATE OR REPLACE FUNCTION validar_tareas_tem_trg()
|
|
6
8
|
RETURNS trigger
|
|
7
9
|
LANGUAGE 'plpgsql'
|
|
@@ -23,8 +25,8 @@ begin
|
|
|
23
25
|
if old.asignado is distinct from new.asignado and not v_permite_asignar then
|
|
24
26
|
raise exception 'Error: no es posible asignar en la encuesta % del operativo % ya que su estado no lo permite', new.enc, new.operativo;
|
|
25
27
|
end if;
|
|
26
|
-
if not (new.tarea = v_tarea_actual or
|
|
27
|
-
old.asignado is distinct from new.asignado and new.tarea = v_tarea_proxima) then
|
|
28
|
+
if not (new.tarea = coalesce(v_tarea_actual,'nulo') or
|
|
29
|
+
old.asignado is distinct from new.asignado and new.tarea = coalesce(v_tarea_proxima,'nulo')) then
|
|
28
30
|
raise exception 'Error: no es posible modificar la encuesta % del operativo % ya que la tarea actual definida en TEM no coincide con la tarea %', new.enc, new.operativo, new.tarea;
|
|
29
31
|
end if;
|
|
30
32
|
if old.asignado is distinct from new.asignado then
|
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.3.
|
|
4
|
+
"version": "0.3.32",
|
|
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.5",
|
|
17
17
|
"procesamiento": "^1.0.10",
|
|
18
|
-
"backend-plus": "^1.17.
|
|
18
|
+
"backend-plus": "^1.17.16",
|
|
19
19
|
"qrcode": "^1.5.0",
|
|
20
20
|
"react": "~17.0.2",
|
|
21
21
|
"react-dom": "~17.0.2",
|