Compare commits
5
Commits
c1719d4b6e
...
6ec15cfb3d
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6ec15cfb3d | ||
|
|
aeab10ce0d | ||
|
|
0641c6b2be | ||
|
|
c7442a777b | ||
|
|
7e2f99b50e |
@@ -32,7 +32,7 @@
|
|||||||
<MINIPAGE name="Separator" width="1" length="max" color="#ffffff" bgColor="#ffffff" layoutDirection="leftToRight"/>
|
<MINIPAGE name="Separator" width="1" length="max" color="#ffffff" bgColor="#ffffff" layoutDirection="leftToRight"/>
|
||||||
<WORDBOX name="WordBox7" length=".2inch" bgColor="#54565a" floatingBehavior="enclosed"/>
|
<WORDBOX name="WordBox7" length=".2inch" bgColor="#54565a" floatingBehavior="enclosed"/>
|
||||||
<LAYOUTNODE name="logo1" width="max" length="min" alignment="none" bgColor="#54565a" layoutDirection="bottomToTop" floatingBehavior="enclosed">
|
<LAYOUTNODE name="logo1" width="max" length="min" alignment="none" bgColor="#54565a" layoutDirection="bottomToTop" floatingBehavior="enclosed">
|
||||||
<IMAGEBOX name="ImageBox3" width="1.5inch" alignment="center" baselineType="leftleft" floatingBehavior="enclosed" url="{{"file:///F:/MARMOTECHC/BIN320/IMAGENES/marmotech.png"}}" fill="preserveAspectRatio" intendedResolution="72"/>
|
<IMAGEBOX name="ImageBox3" width="1.5inch" alignment="center" baselineType="leftleft" floatingBehavior="enclosed" url="{{"IMAGENES/Logo.png"}}" fill="preserveAspectRatio" intendedResolution="72"/>
|
||||||
</LAYOUTNODE>
|
</LAYOUTNODE>
|
||||||
</LAYOUTNODE>
|
</LAYOUTNODE>
|
||||||
</MINIPAGE>
|
</MINIPAGE>
|
||||||
@@ -40,7 +40,7 @@
|
|||||||
<MINIPAGE name="objetivos1" width="max" length="max" bgColor="#54565a" layoutDirection="topToBottom" floatingBehavior="free" marginTopWidth="0">
|
<MINIPAGE name="objetivos1" width="max" length="max" bgColor="#54565a" layoutDirection="topToBottom" floatingBehavior="free" marginTopWidth="0">
|
||||||
<LAYOUTNODE name="logo" width="min" length="min" alignment="center" layoutDirection="topToBottom" floatingBehavior="enclosed">
|
<LAYOUTNODE name="logo" width="min" length="min" alignment="center" layoutDirection="topToBottom" floatingBehavior="enclosed">
|
||||||
<WORDBOX name="WordBox8" length=".5inch" floatingBehavior="enclosed"/>
|
<WORDBOX name="WordBox8" length=".5inch" floatingBehavior="enclosed"/>
|
||||||
<IMAGEBOX name="ImageBox" width="1.5inch" alignment="center" transformTransparently="true" floatingBehavior="enclosed" url="{{"file:///F:/MARMOTECHC/BIN320/IMAGENES/marmotech.png"}}" fill="completely" intendedResolution="72"/>
|
<IMAGEBOX name="ImageBox" width="1.5inch" alignment="center" transformTransparently="true" floatingBehavior="enclosed" url="{{"IMAGENES/Logo.png"}}" fill="completely" intendedResolution="72"/>
|
||||||
</LAYOUTNODE>
|
</LAYOUTNODE>
|
||||||
<LAYOUTNODE name="direccion" width="min" length="min" fontName="Raleway" fontSize="7" layoutDirection="topToBottom" floatingBehavior="enclosed">
|
<LAYOUTNODE name="direccion" width="min" length="min" fontName="Raleway" fontSize="7" layoutDirection="topToBottom" floatingBehavior="enclosed">
|
||||||
<WORDBOX name="WordBox9" length=".4inch" floatingBehavior="enclosed"/>
|
<WORDBOX name="WordBox9" length=".4inch" floatingBehavior="enclosed"/>
|
||||||
|
|||||||
@@ -143,6 +143,7 @@
|
|||||||
<Library binaryName="FUNCIONESREPORT" id="-1423229125" label="FUNCIONESREPORT">
|
<Library binaryName="FUNCIONESREPORT" id="-1423229125" label="FUNCIONESREPORT">
|
||||||
<File filePath="otrodir/msgrp000.4gl"/>
|
<File filePath="otrodir/msgrp000.4gl"/>
|
||||||
<File filePath="otrodir/seleccionarsalida.4gl"/>
|
<File filePath="otrodir/seleccionarsalida.4gl"/>
|
||||||
|
<File filePath="otrodir/vesalidaimpresora.4gl"/>
|
||||||
<File filePath="vedir/veprrp049_1.4gl"/>
|
<File filePath="vedir/veprrp049_1.4gl"/>
|
||||||
<File filePath="otrodir/Configuration.4fd"/>
|
<File filePath="otrodir/Configuration.4fd"/>
|
||||||
</Library>
|
</Library>
|
||||||
@@ -486,6 +487,10 @@
|
|||||||
<File filePath="nodir/nofmcs002.per"/>
|
<File filePath="nodir/nofmcs002.per"/>
|
||||||
<File filePath="nodir/nofmcs004.4fd"/>
|
<File filePath="nodir/nofmcs004.4fd"/>
|
||||||
<File filePath="nodir/nofmcs006.4fd"/>
|
<File filePath="nodir/nofmcs006.4fd"/>
|
||||||
|
<File filePath="nodir/nofmrp002.4fd"/>
|
||||||
|
<File filePath="nodir/nofmrp003.4fd"/>
|
||||||
|
<File filePath="nodir/nofmrp039.4fd"/>
|
||||||
|
<File filePath="nodir/nofmrp044.4fd"/>
|
||||||
</Library>
|
</Library>
|
||||||
<Library binaryName="FUNCIONES_NO" id="-306412216" label="FUNCIONES_NO">
|
<Library binaryName="FUNCIONES_NO" id="-306412216" label="FUNCIONES_NO">
|
||||||
<File filePath="nodir/noprgb000.4gl"/>
|
<File filePath="nodir/noprgb000.4gl"/>
|
||||||
@@ -554,6 +559,26 @@
|
|||||||
<File filePath="nodir/noprcs006.4gl"/>
|
<File filePath="nodir/noprcs006.4gl"/>
|
||||||
<File filePath="bin/noprcs006.4rp"/>
|
<File filePath="bin/noprcs006.4rp"/>
|
||||||
</Application>
|
</Application>
|
||||||
|
<Application binaryName="noprrp002" dependencies="-1026233879,-764824792,-306412216,-335228674,-1423229125" externalDependencies="libgre.42x" id="-700000075" label="noprrp002">
|
||||||
|
<Configuration commandLineArguments="alopez Lopez2023" id="-700000076" label="Configuration"/>
|
||||||
|
<File filePath="nodir/noprrp002.4gl"/>
|
||||||
|
<File filePath="bin/noprrp002.4rp"/>
|
||||||
|
</Application>
|
||||||
|
<Application binaryName="noprrp003" dependencies="-1026233879,-764824792,-306412216,-335228674,-1423229125" externalDependencies="libgre.42x" id="-700000077" label="noprrp003">
|
||||||
|
<Configuration commandLineArguments="alopez Lopez2023" id="-700000078" label="Configuration"/>
|
||||||
|
<File filePath="nodir/noprrp003.4gl"/>
|
||||||
|
<File filePath="bin/noprrp003.4rp"/>
|
||||||
|
</Application>
|
||||||
|
<Application binaryName="noprrp039" dependencies="-1026233879,-764824792,-306412216,-335228674,-1423229125" externalDependencies="libgre.42x" id="-700000079" label="noprrp039">
|
||||||
|
<Configuration commandLineArguments="alopez Lopez2023" id="-700000080" label="Configuration"/>
|
||||||
|
<File filePath="nodir/noprrp039.4gl"/>
|
||||||
|
<File filePath="bin/noprrp039.4rp"/>
|
||||||
|
</Application>
|
||||||
|
<Application binaryName="noprrp044" dependencies="-1026233879,-764824792,-306412216,-335228674,-1423229125" externalDependencies="libgre.42x" id="-700000081" label="noprrp044">
|
||||||
|
<Configuration commandLineArguments="alopez Lopez2023" id="-700000082" label="Configuration"/>
|
||||||
|
<File filePath="nodir/noprrp044.4gl"/>
|
||||||
|
<File filePath="bin/noprrp044.4rp"/>
|
||||||
|
</Application>
|
||||||
</Group>
|
</Group>
|
||||||
<Group id="1667448785" label="PRODUCTOS TERMINADOS">
|
<Group id="1667448785" label="PRODUCTOS TERMINADOS">
|
||||||
<Library binaryName="FORMULARIOS_IP" dependencies="-1026233879" id="-1826025351" label="FORMULARIOS_IP">
|
<Library binaryName="FORMULARIOS_IP" dependencies="-1026233879" id="-1826025351" label="FORMULARIOS_IP">
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8" ?>
|
<?xml version="1.0" encoding="UTF-8" ?>
|
||||||
<ManagedForm databaseName="marmotech" fileVersion="31400" gstVersion="3140a" name="ManagedForm" uid="{d7d471c5-a746-452d-9cbb-7c33717f2215}">
|
<ManagedForm databaseName="smarmotech" fileVersion="31400" gstVersion="3140a" name="ManagedForm" uid="{d7d471c5-a746-452d-9cbb-7c33717f2215}">
|
||||||
<AGSettings>
|
<AGSettings>
|
||||||
<DynamicProperties version="2"/>
|
<DynamicProperties version="2"/>
|
||||||
</AGSettings>
|
</AGSettings>
|
||||||
@@ -14,7 +14,7 @@
|
|||||||
<Form gridHeight="9" gridWidth="53" name="nofmrp002">
|
<Form gridHeight="9" gridWidth="53" name="nofmrp002">
|
||||||
<Grid gridHeight="9" gridWidth="53" name="grid1" posX="0" posY="0">
|
<Grid gridHeight="9" gridWidth="53" name="grid1" posX="0" posY="0">
|
||||||
<Label gridHeight="1" gridWidth="13" name="label1" posX="3" posY="1" text="Nomina No. "/>
|
<Label gridHeight="1" gridWidth="13" name="label1" posX="3" posY="1" text="Nomina No. "/>
|
||||||
<Edit colName="num_nomi" fieldId="0" gridHeight="1" gridWidth="6" name="num_nomi" posX="17" posY="1" sqlTabName="formonly" sqlType="INTEGER" tabIndex="1" widget="Edit"/>
|
<Edit colName="num_nomi" fieldId="0" gridHeight="1" gridWidth="9" name="num_nomi" posX="17" posY="1" sqlTabName="formonly" sqlType="INTEGER" tabIndex="1" widget="Edit"/>
|
||||||
<Label gridHeight="1" gridWidth="11" name="label2" posX="27" posY="1" text="Tipo Emp."/>
|
<Label gridHeight="1" gridWidth="11" name="label2" posX="27" posY="1" text="Tipo Emp."/>
|
||||||
<ComboBox colName="tipo_emp" fieldId="1" gridHeight="1" gridWidth="11" items="QUINCENAL, TEMPORAL" name="tipo_emp" posX="39" posY="1" scroll="true" sqlTabName="formonly" sqlType="CHAR" tabIndex="2" widget="ComboBox">
|
<ComboBox colName="tipo_emp" fieldId="1" gridHeight="1" gridWidth="11" items="QUINCENAL, TEMPORAL" name="tipo_emp" posX="39" posY="1" scroll="true" sqlTabName="formonly" sqlType="CHAR" tabIndex="2" widget="ComboBox">
|
||||||
<Item lstrtext="false" name="Q" text="QUINCENAL"/>
|
<Item lstrtext="false" name="Q" text="QUINCENAL"/>
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ DEFINE
|
|||||||
idx INT,
|
idx INT,
|
||||||
selec1 STRING,
|
selec1 STRING,
|
||||||
r_filename STRING,
|
r_filename STRING,
|
||||||
r_output SMALLINT,
|
r_output STRING,
|
||||||
preview SMALLINT,
|
preview SMALLINT,
|
||||||
handler om.SaxDocumentHandler,
|
handler om.SaxDocumentHandler,
|
||||||
varia CHAR(12)
|
varia CHAR(12)
|
||||||
|
|||||||
@@ -57,6 +57,12 @@ FUNCTION noprrp003()
|
|||||||
RETURN
|
RETURN
|
||||||
END IF
|
END IF
|
||||||
|
|
||||||
|
-- El combo "departamento" usa NULL como valor para "TODOS", pero
|
||||||
|
-- CONSTRUCT traduce eso a "e.departamento is null", que excluye
|
||||||
|
-- (en vez de incluir) a los empleados con departamento asignado.
|
||||||
|
-- Se neutraliza esa condicion para que "TODOS" no filtre nada.
|
||||||
|
CALL neutraliza_depto_null(criterio) RETURNING criterio
|
||||||
|
|
||||||
LET query =
|
LET query =
|
||||||
"SELECT a.num_emp, ",
|
"SELECT a.num_emp, ",
|
||||||
" RTRIM(e.nom1_emp)+' '+RTRIM(ISNULL(e.apell1_emp,'')), ",
|
" RTRIM(e.nom1_emp)+' '+RTRIM(ISNULL(e.apell1_emp,'')), ",
|
||||||
@@ -84,6 +90,7 @@ FUNCTION noprrp003()
|
|||||||
FOREACH cur_rep INTO inv[idx].*
|
FOREACH cur_rep INTO inv[idx].*
|
||||||
LET idx = idx + 1
|
LET idx = idx + 1
|
||||||
END FOREACH
|
END FOREACH
|
||||||
|
CALL inv.deleteElement(idx) -- descarta la fila vacia que deja el FOREACH
|
||||||
|
|
||||||
IF idx > 1 THEN
|
IF idx > 1 THEN
|
||||||
LET r_filename = "noprrp003.4rp"
|
LET r_filename = "noprrp003.4rp"
|
||||||
@@ -143,5 +150,20 @@ REPORT rep_herr(x)
|
|||||||
ON EVERY ROW
|
ON EVERY ROW
|
||||||
PRINTX x.fecha, x.codigo, x.descripcion, x.documento, x.cantidad
|
PRINTX x.fecha, x.codigo, x.descripcion, x.documento, x.cantidad
|
||||||
|
|
||||||
|
|
||||||
END REPORT
|
END REPORT
|
||||||
|
|
||||||
|
FUNCTION neutraliza_depto_null(criterio)
|
||||||
|
DEFINE criterio STRING
|
||||||
|
DEFINE patron STRING
|
||||||
|
DEFINE pos INT
|
||||||
|
|
||||||
|
LET patron = "e.departamento is null"
|
||||||
|
LET pos = criterio.getIndexOf(patron, 1)
|
||||||
|
IF pos > 0 THEN
|
||||||
|
LET criterio = criterio.subString(1, pos - 1), "1=1",
|
||||||
|
criterio.subString(pos + patron.getLength(), criterio.getLength())
|
||||||
|
END IF
|
||||||
|
|
||||||
|
RETURN criterio
|
||||||
|
END FUNCTION
|
||||||
@@ -52,27 +52,27 @@ OPEN WINDOW w1 WITH FORM "nofmrp039"
|
|||||||
IF fotos = "SI" THEN
|
IF fotos = "SI" THEN
|
||||||
LET selec =
|
LET selec =
|
||||||
"SELECT a.num_emp,a.departamento,a.cod_puesto,",
|
"SELECT a.num_emp,a.departamento,a.cod_puesto,",
|
||||||
" a.nom1_emp,a.apell1_emp,a.apell2_emp,a.calle,a.casa_num,CONVERT(CHAR(10),a.fech_efec,103), ",
|
" a.nom1_emp,a.apell1_emp,a.apell2_emp,a.calle,a.casa_num,a.fech_efec, ",
|
||||||
" a.cedula,a.sueldo_ac,a.fech_nac,a.foto_empleado ",
|
" a.cedula,a.sueldo_ac,a.fech_nac,a.foto_empleado ",
|
||||||
" FROM adtb00003 a WHERE ",criterio CLIPPED, " AND and a.fech_efec IS NOT NULL
|
" FROM adtb00003 a WHERE ",criterio CLIPPED, " AND a.fech_efec IS NOT NULL
|
||||||
AND a.foto_empleado IS NOT NULL
|
AND a.foto_empleado IS NOT NULL
|
||||||
ORDER BY a.departamento,a.num_emp "
|
ORDER BY a.departamento,a.num_emp "
|
||||||
ELSE
|
ELSE
|
||||||
LET selec =
|
LET selec =
|
||||||
"SELECT a.num_emp,a.departamento,a.cod_puesto,",
|
"SELECT a.num_emp,a.departamento,a.cod_puesto,",
|
||||||
" a.nom1_emp,a.apell1_emp,a.apell2_emp,a.calle,a.casa_num,CONVERT(CHAR(10),a.fech_efec,103), ",
|
" a.nom1_emp,a.apell1_emp,a.apell2_emp,a.calle,a.casa_num,a.fech_efec, ",
|
||||||
" a.cedula,a.sueldo_ac,a.fech_nac,a.foto_empleado ",
|
" a.cedula,a.sueldo_ac,a.fech_nac,a.foto_empleado ",
|
||||||
" FROM adtb00003 a WHERE ",criterio CLIPPED, " AND and a.fech_efec IS NOT NULL
|
" FROM adtb00003 a WHERE ",criterio CLIPPED, " AND a.fech_efec IS NOT NULL
|
||||||
AND a.foto_empleado IS NULL
|
AND a.foto_empleado IS NULL
|
||||||
ORDER BY a.departamento,a.num_emp "
|
ORDER BY a.departamento,a.num_emp "
|
||||||
END IF
|
END IF
|
||||||
IF fotos = "TODOS" THEN
|
IF fotos = "TODOS" THEN
|
||||||
LET selec =
|
LET selec =
|
||||||
"SELECT a.num_emp,a.departamento,a.cod_puesto,",
|
"SELECT a.num_emp,a.departamento,a.cod_puesto,",
|
||||||
" a.nom1_emp,a.apell1_emp,a.apell2_emp,a.calle,a.casa_num,CONVERT(CHAR(10),a.fech_efec,103), ",
|
" a.nom1_emp,a.apell1_emp,a.apell2_emp,a.calle,a.casa_num,a.fech_efec, ",
|
||||||
" a.cedula,a.sueldo_ac,a.fech_nac,a.foto_empleado ",
|
" a.cedula,a.sueldo_ac,a.fech_nac,a.foto_empleado ",
|
||||||
" FROM adtb00003 a WHERE ",criterio CLIPPED, " AND and a.fech_efec IS NOT NULL
|
" FROM adtb00003 a WHERE ",criterio CLIPPED, " AND a.fech_efec IS NOT NULL
|
||||||
AND a.foto_empleado IS NOT NULL
|
AND a.foto_empleado IS NOT NULL
|
||||||
ORDER BY a.departamento,a.num_emp "
|
ORDER BY a.departamento,a.num_emp "
|
||||||
END IF
|
END IF
|
||||||
END IF
|
END IF
|
||||||
@@ -80,10 +80,10 @@ OPEN WINDOW w1 WITH FORM "nofmrp039"
|
|||||||
LET chEmpleados = "EMPLEADOS ACTIVOS"
|
LET chEmpleados = "EMPLEADOS ACTIVOS"
|
||||||
LET selec =
|
LET selec =
|
||||||
"SELECT a.num_emp,a.departamento,a.cod_puesto,",
|
"SELECT a.num_emp,a.departamento,a.cod_puesto,",
|
||||||
" a.nom1_emp,a.apell1_emp,a.apell2_emp,a.calle,a.casa_num,CONVERT(CHAR(10),a.fech_efec,103), ",
|
" a.nom1_emp,a.apell1_emp,a.apell2_emp,a.calle,a.casa_num,a.fech_efec, ",
|
||||||
" a.cedula,a.sueldo_ac,a.fech_nac,a.foto_empleado ",
|
" a.cedula,a.sueldo_ac,a.fech_nac,a.foto_empleado ",
|
||||||
" FROM adtb00003 a WHERE ",criterio CLIPPED,
|
" FROM adtb00003 a WHERE ",criterio CLIPPED,
|
||||||
" AND (a.status_t is null or a.status_t = 'I') and a.fech_efec IS NOT NULL ",
|
" AND (a.status_t is null or a.status_t = 'I') and a.fech_efec IS NOT NULL ",
|
||||||
" ORDER BY a.departamento,a.num_emp "
|
" ORDER BY a.departamento,a.num_emp "
|
||||||
END IF
|
END IF
|
||||||
|
|
||||||
@@ -91,10 +91,10 @@ OPEN WINDOW w1 WITH FORM "nofmrp039"
|
|||||||
LET chEmpleados = "EMPLEADOS DESACTIVOS"
|
LET chEmpleados = "EMPLEADOS DESACTIVOS"
|
||||||
LET selec =
|
LET selec =
|
||||||
"SELECT a.num_emp,a.departamento,a.cod_puesto,",
|
"SELECT a.num_emp,a.departamento,a.cod_puesto,",
|
||||||
" a.nom1_emp,a.apell1_emp,a.apell2_emp,a.calle,a.casa_num,CONVERT(CHAR(10),a.fech_efec,103),",
|
" a.nom1_emp,a.apell1_emp,a.apell2_emp,a.calle,a.casa_num,a.fech_efec,",
|
||||||
" a.cedula,a.sueldo_ac,a.fech_nac,a.foto_empleado ",
|
" a.cedula,a.sueldo_ac,a.fech_nac,a.foto_empleado ",
|
||||||
" FROM adtb00003 a WHERE ",criterio CLIPPED,
|
" FROM adtb00003 a WHERE ",criterio CLIPPED,
|
||||||
" AND a.status_t is not null and a.fech_efec IS NOT NULL",
|
" AND a.status_t is not null and a.fech_efec IS NOT NULL",
|
||||||
" ORDER BY a.departamento,a.num_emp "
|
" ORDER BY a.departamento,a.num_emp "
|
||||||
|
|
||||||
END IF
|
END IF
|
||||||
|
|||||||
Reference in New Issue
Block a user