dmencu 2.0.19 → 2.0.20

package/install/usuarios_trg.sql

@@ -1,41 +1,41 @@
---set role dmencu_owner;
-set role to ut2023_muleto_owner;
-set search_path=base;
-
-DROP FUNCTION if exists usuarios_trg();
-set search_path = base;
-
-CREATE OR REPLACE FUNCTION usuarios_trg()
-  RETURNS trigger
-  LANGUAGE 'plpgsql'
-AS $BODY$
-declare
-  v_rol_usuario_actual text;
-  v_puede_asignar_rol boolean;
-begin
-  if new.rol is distinct from old.rol then
-    select rol
-      into v_rol_usuario_actual
-      from usuarios
-      where usuario = split_part(current_setting('application_name'),' ',1);
-    select true 
-      into v_puede_asignar_rol
-      from roles_subordinados
-      where rol = v_rol_usuario_actual and rol_subordinado = new.rol;
-    if v_puede_asignar_rol or v_rol_usuario_actual = 'admin' then
-      null; 
-    else 
-      raise exception 'No se peude asignar el rol %', new.rol;
-    end if;
-  end if;
-  return new;
-end;
-$BODY$;
-
-DROP TRIGGER IF EXISTS usuarios_trg ON usuarios;
-CREATE TRIGGER usuarios_trg
-  BEFORE UPDATE OR INSERT
-  ON usuarios
-  FOR EACH ROW
-  EXECUTE PROCEDURE usuarios_trg();   
-
+--set role dmencu_owner;
+set role to ut2023_muleto_owner;
+set search_path=base;
+
+DROP FUNCTION if exists usuarios_trg();
+set search_path = base;
+
+CREATE OR REPLACE FUNCTION usuarios_trg()
+  RETURNS trigger
+  LANGUAGE 'plpgsql'
+AS $BODY$
+declare
+  v_rol_usuario_actual text;
+  v_puede_asignar_rol boolean;
+begin
+  if new.rol is distinct from old.rol then
+    select rol
+      into v_rol_usuario_actual
+      from usuarios
+      where usuario = split_part(current_setting('application_name'),' ',1);
+    select true 
+      into v_puede_asignar_rol
+      from roles_subordinados
+      where rol = v_rol_usuario_actual and rol_subordinado = new.rol;
+    if v_puede_asignar_rol or v_rol_usuario_actual = 'admin' then
+      null; 
+    else 
+      raise exception 'No se peude asignar el rol %', new.rol;
+    end if;
+  end if;
+  return new;
+end;
+$BODY$;
+
+DROP TRIGGER IF EXISTS usuarios_trg ON usuarios;
+CREATE TRIGGER usuarios_trg
+  BEFORE UPDATE OR INSERT
+  ON usuarios
+  FOR EACH ROW
+  EXECUTE PROCEDURE usuarios_trg();   
+

package/install/validar_tareas_tem_trg.sql

@@ -1,67 +1,67 @@
---set role dmencu_owner;
---set search_path=base;
-
-DROP FUNCTION if exists validar_tareas_tem_trg();
-set search_path = base;
-
-CREATE OR REPLACE FUNCTION validar_tareas_tem_trg()
-    RETURNS trigger
-    LANGUAGE 'plpgsql'
-AS $BODY$
-declare 
-    v_habilitada    boolean;
-    v_tarea_actual  text;
-    v_permite_asignar boolean;
-    v_estado_al_asignar text;
-    v_tarea_inicial text;
-begin
-    select tarea_actual, habilitada into v_tarea_actual, v_habilitada
-        from tem 
-        where operativo = new.operativo and enc = new.enc;
-    select permite_asignar, estado_al_asignar into v_permite_asignar, v_estado_al_asignar
-        from estados
-        where operativo = new.operativo and estado =  new.estado;
-    select tarea into v_tarea_inicial
-        from tareas 
-        where operativo = new.operativo and es_inicial;
-    if v_habilitada then
-        if old.asignado is distinct from new.asignado then 
-            if not v_permite_asignar then
-                raise exception 'Error: no es posible asignar en la encuesta % del operativo % ya que su estado no lo permite', new.enc, new.operativo;
-            end if;
-            if new.recepcionista is null then 
-                raise exception 'Error: no es posible asignar en la encuesta % del operativo % ya que no se indicó un/a recepcionista', new.enc, new.operativo;
-            end if;
-            if not (new.tarea = coalesce(v_tarea_actual,'nulo') or new.tarea = v_tarea_inicial) then
-                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;
-            end if;
-        end if;
-        if old.recepcionista is distinct from new.recepcionista then
-            if new.recepcionista is null and new.asignado is not null then 
-                raise exception 'Error: no es posible quitar el recepcionista de la encuesta % del operativo % ya que se la misma se encuentra asignada', new.enc, new.operativo;
-            end if;
-        end if;
-        if old.asignado is distinct from new.asignado then
-            if new.asignado is null then
-                new.estado = '0D';
-            else
-                --if v_tarea_actual is distinct from new.tarea then    
-                    if v_estado_al_asignar is not null then
-                        new.estado = v_estado_al_asignar;
-                    end if;
-                --end if;
-            end if;
-        end if;
-    else 
-        raise exception 'Error: la encuesta % del operativo % se encuentra deshabilitada', new.enc, new.operativo;
-    end if;
-    return new;
-end;
-$BODY$;
-
-DROP TRIGGER IF EXISTS validar_tareas_tem_trg ON tareas_tem;
-CREATE TRIGGER validar_tareas_tem_trg
-   BEFORE UPDATE
-   ON tareas_tem
-   FOR EACH ROW
-   EXECUTE PROCEDURE validar_tareas_tem_trg();   
+--set role dmencu_owner;
+--set search_path=base;
+
+DROP FUNCTION if exists validar_tareas_tem_trg();
+set search_path = base;
+
+CREATE OR REPLACE FUNCTION validar_tareas_tem_trg()
+    RETURNS trigger
+    LANGUAGE 'plpgsql'
+AS $BODY$
+declare 
+    v_habilitada    boolean;
+    v_tarea_actual  text;
+    v_permite_asignar boolean;
+    v_estado_al_asignar text;
+    v_tarea_inicial text;
+begin
+    select tarea_actual, habilitada into v_tarea_actual, v_habilitada
+        from tem 
+        where operativo = new.operativo and enc = new.enc;
+    select permite_asignar, estado_al_asignar into v_permite_asignar, v_estado_al_asignar
+        from estados
+        where operativo = new.operativo and estado =  new.estado;
+    select tarea into v_tarea_inicial
+        from tareas 
+        where operativo = new.operativo and es_inicial;
+    if v_habilitada then
+        if old.asignado is distinct from new.asignado then 
+            if not v_permite_asignar then
+                raise exception 'Error: no es posible asignar en la encuesta % del operativo % ya que su estado no lo permite', new.enc, new.operativo;
+            end if;
+            if new.recepcionista is null then 
+                raise exception 'Error: no es posible asignar en la encuesta % del operativo % ya que no se indicó un/a recepcionista', new.enc, new.operativo;
+            end if;
+            if not (new.tarea = coalesce(v_tarea_actual,'nulo') or new.tarea = v_tarea_inicial) then
+                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;
+            end if;
+        end if;
+        if old.recepcionista is distinct from new.recepcionista then
+            if new.recepcionista is null and new.asignado is not null then 
+                raise exception 'Error: no es posible quitar el recepcionista de la encuesta % del operativo % ya que se la misma se encuentra asignada', new.enc, new.operativo;
+            end if;
+        end if;
+        if old.asignado is distinct from new.asignado then
+            if new.asignado is null then
+                new.estado = '0D';
+            else
+                --if v_tarea_actual is distinct from new.tarea then    
+                    if v_estado_al_asignar is not null then
+                        new.estado = v_estado_al_asignar;
+                    end if;
+                --end if;
+            end if;
+        end if;
+    else 
+        raise exception 'Error: la encuesta % del operativo % se encuentra deshabilitada', new.enc, new.operativo;
+    end if;
+    return new;
+end;
+$BODY$;
+
+DROP TRIGGER IF EXISTS validar_tareas_tem_trg ON tareas_tem;
+CREATE TRIGGER validar_tareas_tem_trg
+   BEFORE UPDATE
+   ON tareas_tem
+   FOR EACH ROW
+   EXECUTE PROCEDURE validar_tareas_tem_trg();   

package/package.json

@@ -1,91 +1,91 @@
-{
-  "name": "dmencu",
-  "description": "DM Encu - Encuestas en dispositivo móvil",
-  "version": "2.0.19",
-  "author": "Codenautas <codenautas@googlegroups.com>",
-  "license": "MIT",
-  "main": "dist/server/server/app-dmencu.js",
-  "types": "dist/server/server/app-dmencu.d.ts",
-  "files": [
-    "dist",
-    "install"
-  ],
-  "dependencies": {
-    "@mui/material": "^5.16.7",
-    "memoize-one": "~6.0.0",
-    "meta-enc": "^1.4.16",
-    "procesamiento": "^2.0.10",
-    "backend-plus": "^2.5.2-betha.4",
-    "qrcode": "^1.5.3",
-    "react": "~17.0.2",
-    "react-dom": "~17.0.2",
-    "react-redux": "~7.2.6",
-    "redux": "~4.1.2",
-    "redux-typed-reducer": "~0.1.1",
-    "service-worker-admin": "^0.2.1",
-    "yazl": "~2.5.1",
-    "row-validator": "^1.0.0-rc1",
-    "like-ar": "^0.3.9"
-  },
-  "dependencias provisorias: las que se pongan en dependencias ponerlas acá y sacarlas juntas": {},
-  "devDependencies": {
-    "@types/mocha": "^10.0.1",
-    "@types/node": "^20.3.0",
-    "@types/qrcode": "^1.5.0",
-    "@types/react": "^17.0.38",
-    "@types/react-dom": "^17.0.11",
-    "@types/react-redux": "^7.1.22",
-    "@types/yazl": "~2.4.2",
-    "mixin-patch": "~0.4.1",
-    "pg-triggers": "~0.3.2",
-    "types.d.ts": "~0.6.15",
-    "typescript": "^5.1.3"
-  },
-  "engines": {
-    "node": ">= 16.18.0"
-  },
-  "scripts": {
-    "prepare": "npm run build",
-    "build": "(tsc -p src/server || echo \"continue w/error\") && (tsc -p src/unlogged || echo \"continue w/error\") && (tsc -p src/client || echo \"continue w/error\") && mixin-patch",
-    "build-client": "(tsc -p src/client || echo \"continue w/error\") && mixin-patch",
-    "build-unlogged": "(tsc -p src/unlogged || echo \"continue w/error\") && mixin-patch",
-    "mixin-patch": "mixin-patch",
-    "watch:buildC": "(tsc -p src/client --watch || echo \"continue w/error\")",
-    "watch:buildS": "(tsc -p src/server --watch || echo \"continue w/error\")",
-    "watch:buildU": "(tsc -p src/unlogged --watch || echo \"continue w/error\")",
-    "test": "mocha --reporter spec --bail --check-leaks test/",
-    "start": "node dist/server/server/server-dmencu.js",
-    "dump": "npm start -- --dump-db",
-    "bdump": "npm run build && npm run dump",
-    "git-commit": "git add package.json && (git commit -m \"upgrading stack dependencies\" || true)",
-    "push-publish": "npm version patch && npm run git-commit && npm publish && git push"
-  },
-  "config": {
-    "stackFolder": "../../codenautas"
-  },
-  "qa-control": {
-    "package-version": "0.3.0",
-    "coverage": 90,
-    "run-in": "server",
-    "stability": "extending",
-    "type": "app",
-    "ecmaVersion": 6
-  },
-  "mixin-patch": {
-    "patch": false,
-    "copy": [
-      {
-        "from": "src/client",
-        "to": "dist/client/client"
-      },
-      {
-        "from": "src/unlogged",
-        "to": "dist/unlogged/unlogged"
-      },
-      {
-        "from": "src/unlogged",
-        "to": "dist/client/unlogged"
-      }
-    ]
-  }
-}
+{
+  "name": "dmencu",
+  "description": "DM Encu - Encuestas en dispositivo móvil",
+  "version": "2.0.20",
+  "author": "Codenautas <codenautas@googlegroups.com>",
+  "license": "MIT",
+  "main": "dist/server/server/app-dmencu.js",
+  "types": "dist/server/server/app-dmencu.d.ts",
+  "files": [
+    "dist",
+    "install"
+  ],
+  "dependencies": {
+    "@mui/material": "^5.16.7",
+    "memoize-one": "~6.0.0",
+    "meta-enc": "^1.4.16",
+    "procesamiento": "^2.0.10",
+    "backend-plus": "^2.5.2-betha.4",
+    "qrcode": "^1.5.3",
+    "react": "~17.0.2",
+    "react-dom": "~17.0.2",
+    "react-redux": "~7.2.6",
+    "redux": "~4.1.2",
+    "redux-typed-reducer": "~0.1.1",
+    "service-worker-admin": "^0.2.1",
+    "yazl": "~2.5.1",
+    "row-validator": "^1.0.0-rc1",
+    "like-ar": "^0.3.9"
+  },
+  "dependencias provisorias: las que se pongan en dependencias ponerlas acá y sacarlas juntas": {},
+  "devDependencies": {
+    "@types/mocha": "^10.0.1",
+    "@types/node": "^20.3.0",
+    "@types/qrcode": "^1.5.0",
+    "@types/react": "^17.0.38",
+    "@types/react-dom": "^17.0.11",
+    "@types/react-redux": "^7.1.22",
+    "@types/yazl": "~2.4.2",
+    "mixin-patch": "~0.4.1",
+    "pg-triggers": "~0.3.2",
+    "types.d.ts": "~0.6.15",
+    "typescript": "^5.1.3"
+  },
+  "engines": {
+    "node": ">= 16.18.0"
+  },
+  "scripts": {
+    "prepare": "npm run build",
+    "build": "(tsc -p src/server || echo \"continue w/error\") && (tsc -p src/unlogged || echo \"continue w/error\") && (tsc -p src/client || echo \"continue w/error\") && mixin-patch",
+    "build-client": "(tsc -p src/client || echo \"continue w/error\") && mixin-patch",
+    "build-unlogged": "(tsc -p src/unlogged || echo \"continue w/error\") && mixin-patch",
+    "mixin-patch": "mixin-patch",
+    "watch:buildC": "(tsc -p src/client --watch || echo \"continue w/error\")",
+    "watch:buildS": "(tsc -p src/server --watch || echo \"continue w/error\")",
+    "watch:buildU": "(tsc -p src/unlogged --watch || echo \"continue w/error\")",
+    "test": "mocha --reporter spec --bail --check-leaks test/",
+    "start": "node dist/server/server/server-dmencu.js",
+    "dump": "npm start -- --dump-db",
+    "bdump": "npm run build && npm run dump",
+    "git-commit": "git add package.json && (git commit -m \"upgrading stack dependencies\" || true)",
+    "push-publish": "npm version patch && npm run git-commit && npm publish && git push"
+  },
+  "config": {
+    "stackFolder": "../../codenautas"
+  },
+  "qa-control": {
+    "package-version": "0.3.0",
+    "coverage": 90,
+    "run-in": "server",
+    "stability": "extending",
+    "type": "app",
+    "ecmaVersion": 6
+  },
+  "mixin-patch": {
+    "patch": false,
+    "copy": [
+      {
+        "from": "src/client",
+        "to": "dist/client/client"
+      },
+      {
+        "from": "src/unlogged",
+        "to": "dist/unlogged/unlogged"
+      },
+      {
+        "from": "src/unlogged",
+        "to": "dist/client/unlogged"
+      }
+    ]
+  }
+}

package/dist/client/server/table-tem.d.ts

@@ -1,3 +0,0 @@
-import { TableDefinition, ContextForDump, FieldDefinition } from "./types-dmencu";
-export declare var getDomicilioFields: () => FieldDefinition[];
-export declare function tem(context: ContextForDump, opts?: any): TableDefinition;