diff options
| author | ramon <ramongomez@us.es> | 2017-06-12 10:28:51 +0000 |
|---|---|---|
| committer | ramon <ramongomez@us.es> | 2017-06-12 10:28:51 +0000 |
| commit | da380e9fab642d37725e378fbcc768ffdfc8984c (patch) | |
| tree | ccebb620672aadb171e93e3520d1c4fa336d7a84 | |
| parent | dced872edd7fb7c924650ef8655d9cdb60e34a1a (diff) | |
#732: Ampliar dato para año en la BD y en servicio de programación de tareas.
git-svn-id: https://opengnsys.es/svn/branches/version1.1@5362 a21b9725-9963-47de-94b9-378ad31fedc9
| -rw-r--r-- | admin/Database/ogAdmBD-1.0.6b-1.1.0pre.sql | 6 | ||||
| -rw-r--r-- | admin/Database/ogAdmBD-1.1.0pre.sql | 4 | ||||
| -rw-r--r-- | admin/Database/ogAdmBD.sql | 4 | ||||
| -rw-r--r-- | admin/Sources/Services/ogAdmAgent/sources/ogAdmAgent.h | 2 |
4 files changed, 12 insertions, 4 deletions
diff --git a/admin/Database/ogAdmBD-1.0.6b-1.1.0pre.sql b/admin/Database/ogAdmBD-1.0.6b-1.1.0pre.sql index 1df76a3e..6fe30987 100644 --- a/admin/Database/ogAdmBD-1.0.6b-1.1.0pre.sql +++ b/admin/Database/ogAdmBD-1.0.6b-1.1.0pre.sql @@ -125,7 +125,7 @@ INSERT INTO parametros (idparametro, nemonico, descripcion, nomidentificador, no (39, 'tit', 'Título', '', '', '', 0, 1), (40, 'msj', 'Contenido', '', '', '', 0, 1); -# Crear tabla de log para la cola de acciones (ticket #...) +# Crear tabla de log para la cola de acciones (ticket #782) CREATE TABLE IF NOT EXISTS acciones_log LIKE acciones; ALTER TABLE acciones_log ADD fecha_borrado DATETIME; DELIMITER // @@ -139,3 +139,7 @@ CREATE TRIGGER registrar_acciones BEFORE DELETE ON acciones FOR EACH ROW BEGIN END// DELIMITER ; +# Ampliar programación de tareas hasta 2025 (ticket #732). +ALTER TABLE programaciones + MODIFY annos SMALLINT DEFAULT NULL; + diff --git a/admin/Database/ogAdmBD-1.1.0pre.sql b/admin/Database/ogAdmBD-1.1.0pre.sql index 48f24a37..50dc55e6 100644 --- a/admin/Database/ogAdmBD-1.1.0pre.sql +++ b/admin/Database/ogAdmBD-1.1.0pre.sql @@ -245,3 +245,7 @@ ALTER TABLE acciones MODIFY fechahorareg DATETIME NOT NULL DEFAULT '1970-01-01 00:00:00', MODIFY fechahorafin DATETIME NOT NULL DEFAULT '1970-01-01 00:00:00'; +# Ampliar programación de tareas hasta 2025 (ticket #732). +ALTER TABLE programaciones + MODIFY annos SMALLINT DEFAULT NULL; + diff --git a/admin/Database/ogAdmBD.sql b/admin/Database/ogAdmBD.sql index a3801da2..25642849 100644 --- a/admin/Database/ogAdmBD.sql +++ b/admin/Database/ogAdmBD.sql @@ -737,8 +737,8 @@ CREATE TABLE IF NOT EXISTS `programaciones` ( `tipoaccion` int(11) DEFAULT NULL, `identificador` int(11) DEFAULT NULL, `nombrebloque` varchar(255) DEFAULT NULL, - `annos` tinyint(4) DEFAULT NULL, - `meses` smallint(4) DEFAULT NULL, + `annos` smallint DEFAULT NULL, + `meses` smallint DEFAULT NULL, `diario` int(11) DEFAULT NULL, `dias` tinyint(4) DEFAULT NULL, `semanas` tinyint(4) DEFAULT NULL, diff --git a/admin/Sources/Services/ogAdmAgent/sources/ogAdmAgent.h b/admin/Sources/Services/ogAdmAgent/sources/ogAdmAgent.h index a2f7deef..b1c429bb 100644 --- a/admin/Sources/Services/ogAdmAgent/sources/ogAdmAgent.h +++ b/admin/Sources/Services/ogAdmAgent/sources/ogAdmAgent.h @@ -27,7 +27,7 @@ // Valores hexadecimales para consultas
// ________________________________________________________________________________________________________
-BYTE HEX_annos[]={0,0x01,0x02,0x04,0x08,0x10,0x20,0x40,0x80};
+WORD HEX_annos[]={0,0x0001,0x0002,0x0004,0x0008,0x0010,0x0020,0x0040,0x0080,0x0100,0x0200,0x0400,0x0800,0x1000,0x2000,0x4000,0x8000};
WORD HEX_meses[]={0,0x0001,0x0002,0x0004,0x0008,0x0010,0x0020,0x0040,0x0080,0x0100,0x0200,0x0400,0x0800};
int HEX_dias[]={0,0x00000001,0x00000002,0x00000004,0x00000008,0x00000010,0x00000020,0x00000040,0x00000080,0x00000100,0x00000200,
0x00000400,0x00000800,0x00001000,0x00002000,0x00004000,0x00008000,0x00010000,0x00020000,0x00040000,0x00080000,
|