From 5c646960bbc3a28029b3ca62f01ee3e7f3edc7e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tiago=20Sim=C3=A3o?= Date: Tue, 28 Sep 2010 18:07:07 +0000 Subject: [PATCH] git-svn-id: https://svn.coded.pt/svn/SIPRP@1504 bb69d46d-e84e-40c8-a05a-06db0d633741 --- trunk/SIPRPSoft/src/SIPRPMap.map.xml | 2251 ----------------- trunk/SIPRPSoft/src/cayenne.xml | 8 - trunk/SIPRPSoft/src/log4j.properties | 3 - .../src/siprp/ui/SIPRPEditorWindow.java | 27 - .../src/siprp/update/UpdateList.java | 46 - .../siprp/update/updates/V10_0_To_V10_1.java | 36 - .../siprp/update/updates/V10_1_To_V10_2.java | 43 - .../siprp/update/updates/V10_2_To_V10_3.java | 46 - .../siprp/update/updates/V10_3_To_V10_4.java | 25 - .../siprp/update/updates/V10_4_To_V10_5.java | 56 - .../siprp/update/updates/V10_5_To_V10_6.java | 29 - .../siprp/update/updates/V10_6_To_V10_7.java | 34 - .../siprp/update/updates/V10_7_To_V10_8.java | 30 - .../siprp/update/updates/V10_8_To_V10_9.java | 26 - .../siprp/update/updates/V10_9_To_V11_0.java | 25 - .../siprp/update/updates/V11_0_To_V11_1.java | 98 - .../V11_0_To_V11_1_Assinatura_Catarina.png | Bin 3247 -> 0 bytes .../V11_0_To_V11_1_Assinatura_Sonia.png | Bin 8975 -> 0 bytes .../siprp/update/updates/V11_1_To_V11_2.java | 25 - .../siprp/update/updates/V11_2_To_V11_3.java | 33 - .../siprp/update/updates/V11_3_To_V11_4.java | 29 - .../siprp/update/updates/V11_4_To_V11_5.java | 27 - .../siprp/update/updates/V11_5_To_V11_6.java | 32 - .../siprp/update/updates/V11_6_To_V11_7.java | 32 - .../siprp/update/updates/V11_7_To_V11_8.java | 29 - .../siprp/update/updates/V11_8_To_V11_9.java | 61 - .../updates/V11_8_To_V11_9_David_Afonso.png | Bin 11147 -> 0 bytes .../V11_9_To_V11_10_Ana_Sofia_Jorge.png | Bin 9761 -> 0 bytes .../V11_9_To_V11_10_Barbara_Goncalves.png | Bin 19985 -> 0 bytes .../siprp/update/updates/V11_9_To_V12_0.java | 93 - .../siprp/update/updates/V12_0_To_V12_1.java | 54 - .../V12_0_To_V12_1_Barbara_Goncalves.png | Bin 9934 -> 0 bytes .../siprp/update/updates/V12_1_To_V12_2.java | 25 - .../siprp/update/updates/V12_2_To_V12_3.java | 45 - .../siprp/update/updates/V12_3_To_V12_4.java | 36 - .../siprp/update/updates/V12_4_To_V12_5.java | 52 - .../siprp/update/updates/V12_5_To_V12_6.java | 23 - .../siprp/update/updates/V12_6_To_V12_7.java | 22 - .../siprp/update/updates/V12_7_To_V12_8.java | 23 - .../siprp/update/updates/V12_8_To_V12_9.java | 69 - .../siprp/update/updates/V12_9_To_V13_0.java | 28 - .../siprp/update/updates/V13_0_To_V13_1.java | 22 - .../siprp/update/updates/V13_1_To_V13_2.java | 33 - .../siprp/update/updates/V13_2_To_V13_3.java | 21 - .../siprp/update/updates/V13_3_To_V13_4.java | 33 - .../siprp/update/updates/V13_7_To_V13_8.java | 19 - .../siprp/update/updates/V14_1_To_V14_2.java | 52 - .../siprp/update/updates/V14_2_To_V14_3.java | 26 - .../siprp/update/updates/V6_1_To_V7_0.java | 43 - .../siprp/update/updates/V7_0_To_V7_2.java | 50 - .../siprp/update/updates/V7_2_To_V7_4.java | 185 -- .../siprp/update/updates/V7_4_To_V7_5.java | 48 - .../siprp/update/updates/V7_5_To_V7_6.java | 38 - .../siprp/update/updates/V7_6_To_V7_7.java | 47 - .../siprp/update/updates/V7_7_To_V7_8.java | 41 - .../siprp/update/updates/V7_8_To_V7_9.java | 57 - .../siprp/update/updates/V7_9_To_V8_0.java | 49 - .../siprp/update/updates/V8_0_To_V8_1.java | 39 - .../siprp/update/updates/V8_1_To_V8_2.java | 72 - .../siprp/update/updates/V8_2_To_V8_3.java | 41 - .../siprp/update/updates/V8_3_To_V8_4.java | 24 - .../siprp/update/updates/V8_4_To_V8_5.java | 25 - .../siprp/update/updates/V8_5_To_V8_6.java | 28 - .../siprp/update/updates/V8_6_To_V8_7.java | 30 - .../siprp/update/updates/V8_7_To_V8_8.java | 30 - .../siprp/update/updates/V8_8_To_V8_9.java | 26 - .../siprp/update/updates/V8_9_To_V9_0.java | 79 - .../siprp/update/updates/V9_0_To_V9_1.java | 114 - .../siprp/update/updates/V9_1_To_V9_2.java | 37 - .../siprp/update/updates/V9_2_To_V9_3.java | 41 - .../siprp/update/updates/V9_3_To_V9_4.java | 37 - .../siprp/update/updates/V9_4_To_V9_5.java | 54 - .../siprp/update/updates/V9_5_To_V9_6.java | 31 - .../siprp/update/updates/V9_6_To_V9_7.java | 40 - .../siprp/update/updates/V9_7_To_V9_8.java | 39 - .../siprp/update/updates/V9_8_To_V9_9.java | 48 - .../siprp/update/updates/V9_9_To_V10_0.java | 54 - 77 files changed, 5174 deletions(-) delete mode 100644 trunk/SIPRPSoft/src/SIPRPMap.map.xml delete mode 100644 trunk/SIPRPSoft/src/cayenne.xml delete mode 100644 trunk/SIPRPSoft/src/log4j.properties delete mode 100644 trunk/SIPRPSoft/src/siprp/ui/SIPRPEditorWindow.java delete mode 100644 trunk/SIPRPSoft/src/siprp/update/updates/V10_0_To_V10_1.java delete mode 100644 trunk/SIPRPSoft/src/siprp/update/updates/V10_1_To_V10_2.java delete mode 100644 trunk/SIPRPSoft/src/siprp/update/updates/V10_2_To_V10_3.java delete mode 100644 trunk/SIPRPSoft/src/siprp/update/updates/V10_3_To_V10_4.java delete mode 100644 trunk/SIPRPSoft/src/siprp/update/updates/V10_4_To_V10_5.java delete mode 100644 trunk/SIPRPSoft/src/siprp/update/updates/V10_5_To_V10_6.java delete mode 100644 trunk/SIPRPSoft/src/siprp/update/updates/V10_6_To_V10_7.java delete mode 100644 trunk/SIPRPSoft/src/siprp/update/updates/V10_7_To_V10_8.java delete mode 100644 trunk/SIPRPSoft/src/siprp/update/updates/V10_8_To_V10_9.java delete mode 100644 trunk/SIPRPSoft/src/siprp/update/updates/V10_9_To_V11_0.java delete mode 100644 trunk/SIPRPSoft/src/siprp/update/updates/V11_0_To_V11_1.java delete mode 100644 trunk/SIPRPSoft/src/siprp/update/updates/V11_0_To_V11_1_Assinatura_Catarina.png delete mode 100644 trunk/SIPRPSoft/src/siprp/update/updates/V11_0_To_V11_1_Assinatura_Sonia.png delete mode 100644 trunk/SIPRPSoft/src/siprp/update/updates/V11_1_To_V11_2.java delete mode 100644 trunk/SIPRPSoft/src/siprp/update/updates/V11_2_To_V11_3.java delete mode 100644 trunk/SIPRPSoft/src/siprp/update/updates/V11_3_To_V11_4.java delete mode 100644 trunk/SIPRPSoft/src/siprp/update/updates/V11_4_To_V11_5.java delete mode 100644 trunk/SIPRPSoft/src/siprp/update/updates/V11_5_To_V11_6.java delete mode 100644 trunk/SIPRPSoft/src/siprp/update/updates/V11_6_To_V11_7.java delete mode 100644 trunk/SIPRPSoft/src/siprp/update/updates/V11_7_To_V11_8.java delete mode 100644 trunk/SIPRPSoft/src/siprp/update/updates/V11_8_To_V11_9.java delete mode 100644 trunk/SIPRPSoft/src/siprp/update/updates/V11_8_To_V11_9_David_Afonso.png delete mode 100644 trunk/SIPRPSoft/src/siprp/update/updates/V11_9_To_V11_10_Ana_Sofia_Jorge.png delete mode 100644 trunk/SIPRPSoft/src/siprp/update/updates/V11_9_To_V11_10_Barbara_Goncalves.png delete mode 100644 trunk/SIPRPSoft/src/siprp/update/updates/V11_9_To_V12_0.java delete mode 100644 trunk/SIPRPSoft/src/siprp/update/updates/V12_0_To_V12_1.java delete mode 100644 trunk/SIPRPSoft/src/siprp/update/updates/V12_0_To_V12_1_Barbara_Goncalves.png delete mode 100644 trunk/SIPRPSoft/src/siprp/update/updates/V12_1_To_V12_2.java delete mode 100644 trunk/SIPRPSoft/src/siprp/update/updates/V12_2_To_V12_3.java delete mode 100644 trunk/SIPRPSoft/src/siprp/update/updates/V12_3_To_V12_4.java delete mode 100644 trunk/SIPRPSoft/src/siprp/update/updates/V12_4_To_V12_5.java delete mode 100644 trunk/SIPRPSoft/src/siprp/update/updates/V12_5_To_V12_6.java delete mode 100644 trunk/SIPRPSoft/src/siprp/update/updates/V12_6_To_V12_7.java delete mode 100644 trunk/SIPRPSoft/src/siprp/update/updates/V12_7_To_V12_8.java delete mode 100644 trunk/SIPRPSoft/src/siprp/update/updates/V12_8_To_V12_9.java delete mode 100644 trunk/SIPRPSoft/src/siprp/update/updates/V12_9_To_V13_0.java delete mode 100644 trunk/SIPRPSoft/src/siprp/update/updates/V13_0_To_V13_1.java delete mode 100644 trunk/SIPRPSoft/src/siprp/update/updates/V13_1_To_V13_2.java delete mode 100644 trunk/SIPRPSoft/src/siprp/update/updates/V13_2_To_V13_3.java delete mode 100644 trunk/SIPRPSoft/src/siprp/update/updates/V13_3_To_V13_4.java delete mode 100644 trunk/SIPRPSoft/src/siprp/update/updates/V13_7_To_V13_8.java delete mode 100644 trunk/SIPRPSoft/src/siprp/update/updates/V14_1_To_V14_2.java delete mode 100644 trunk/SIPRPSoft/src/siprp/update/updates/V14_2_To_V14_3.java delete mode 100644 trunk/SIPRPSoft/src/siprp/update/updates/V6_1_To_V7_0.java delete mode 100644 trunk/SIPRPSoft/src/siprp/update/updates/V7_0_To_V7_2.java delete mode 100644 trunk/SIPRPSoft/src/siprp/update/updates/V7_2_To_V7_4.java delete mode 100644 trunk/SIPRPSoft/src/siprp/update/updates/V7_4_To_V7_5.java delete mode 100644 trunk/SIPRPSoft/src/siprp/update/updates/V7_5_To_V7_6.java delete mode 100644 trunk/SIPRPSoft/src/siprp/update/updates/V7_6_To_V7_7.java delete mode 100644 trunk/SIPRPSoft/src/siprp/update/updates/V7_7_To_V7_8.java delete mode 100644 trunk/SIPRPSoft/src/siprp/update/updates/V7_8_To_V7_9.java delete mode 100644 trunk/SIPRPSoft/src/siprp/update/updates/V7_9_To_V8_0.java delete mode 100644 trunk/SIPRPSoft/src/siprp/update/updates/V8_0_To_V8_1.java delete mode 100644 trunk/SIPRPSoft/src/siprp/update/updates/V8_1_To_V8_2.java delete mode 100644 trunk/SIPRPSoft/src/siprp/update/updates/V8_2_To_V8_3.java delete mode 100644 trunk/SIPRPSoft/src/siprp/update/updates/V8_3_To_V8_4.java delete mode 100644 trunk/SIPRPSoft/src/siprp/update/updates/V8_4_To_V8_5.java delete mode 100644 trunk/SIPRPSoft/src/siprp/update/updates/V8_5_To_V8_6.java delete mode 100644 trunk/SIPRPSoft/src/siprp/update/updates/V8_6_To_V8_7.java delete mode 100644 trunk/SIPRPSoft/src/siprp/update/updates/V8_7_To_V8_8.java delete mode 100644 trunk/SIPRPSoft/src/siprp/update/updates/V8_8_To_V8_9.java delete mode 100644 trunk/SIPRPSoft/src/siprp/update/updates/V8_9_To_V9_0.java delete mode 100644 trunk/SIPRPSoft/src/siprp/update/updates/V9_0_To_V9_1.java delete mode 100644 trunk/SIPRPSoft/src/siprp/update/updates/V9_1_To_V9_2.java delete mode 100644 trunk/SIPRPSoft/src/siprp/update/updates/V9_2_To_V9_3.java delete mode 100644 trunk/SIPRPSoft/src/siprp/update/updates/V9_3_To_V9_4.java delete mode 100644 trunk/SIPRPSoft/src/siprp/update/updates/V9_4_To_V9_5.java delete mode 100644 trunk/SIPRPSoft/src/siprp/update/updates/V9_5_To_V9_6.java delete mode 100644 trunk/SIPRPSoft/src/siprp/update/updates/V9_6_To_V9_7.java delete mode 100644 trunk/SIPRPSoft/src/siprp/update/updates/V9_7_To_V9_8.java delete mode 100644 trunk/SIPRPSoft/src/siprp/update/updates/V9_8_To_V9_9.java delete mode 100644 trunk/SIPRPSoft/src/siprp/update/updates/V9_9_To_V10_0.java diff --git a/trunk/SIPRPSoft/src/SIPRPMap.map.xml b/trunk/SIPRPSoft/src/SIPRPMap.map.xml deleted file mode 100644 index 7db0122f..00000000 --- a/trunk/SIPRPSoft/src/SIPRPMap.map.xml +++ /dev/null @@ -1,2251 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - ORACLE - - - - - - - - - - ORACLE - ecd_oficial_id_seq - 1 - - - - - - - - ORACLE - email_plano_de_actuacao_id_seq - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ORACLE - etiquetas_id_seq - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ORACLE - exames_portaria_id_seq - 1 - - - - - - - - - - - - - - - - ORACLE - hs_area_id_seq - 1 - - - - - - - ORACLE - hs_email_id_seq - 1 - - - - - - - - - - - - - - - - - - ORACLE - hs_equipamento_id_seq - 1 - - - - - - - - - ORACLE - hs_legislacao_id_seq - 1 - - - - - - - - ORACLE - hs_legislacao_categoria_id_seq - 1 - - - - - - - - - - - - - - - - - - ORACLE - hs_medida_id_seq - 1 - - - - - - - - - - ORACLE - hs_normalizacao_id_seq - 1 - - - - - - - - - - - - - - - - - - ORACLE - hs_posto_id_seq - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ORACLE - hs_relatorio_id_seq - 1 - - - - - - - - - - - ORACLE - hs_relatorio_area_id_seq - 1 - - - - - - - - - - - - ORACLE - hs_relatorio_equipamento_id_seq - 1 - - - - - - - - - - - ORACLE - hs_relatorio_legislacao_id_seq - 1 - - - - - - - - - - - ORACLE - hs_relatorio_medida_id_seq - 1 - - - - - - - - - - - ORACLE - hs_relatorio_legislacao_id_seq - 1 - - - - - - - - - - - ORACLE - hs_relatorio_posto_id_seq - 1 - - - - - - - - - - - - - - - - ORACLE - hs_relatorio_posto_risco_id_seq - 1 - - - - - - - - - - ORACLE - hs_relatorio_risco_id_seq - 1 - - - - - - - - - - - - - ORACLE - hs_risco_id_seq - 1 - - - - - - - - - - - - - - - - ORACLE - hs_risco_tema_id_seq - 1 - - - - - - - - ORACLE - image_id_seq - 1 - - - - - - - - - - - - - - - - - - - ORACLE - lembretes_id_seq - 1 - - - - - - - - - - ORACLE - lembretes_tipos_id_seq - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - ORACLE - marcacoes_grupos_realizados_id_seq - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ORACLE - marcacoes_trabalhador_estados_id_seq - 1 - - - - - - - - - - - - - - - - - - - - - - - - ORACLE - prestadores_id_seq - 1 - - - - - - - - ORACLE - prestadores_grupos_protocolo_id_seq - 1 - - - - - - - - - ORACLE - prt_elementos_protocolo_id_seq - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ORACLE - trabalhadores_consultas_id_seq - 1 - - - - - - - - - - ORACLE - trabalhadores_consultas_datas_id_seq - 1 - - - - - - - - - - - ORACLE - trabalhadores_consultas_datas_emails_id_seq - 1 - - - - - - - - ORACLE - trabalhadores_consultas_datas_observacoes_id_seq - 1 - - - - - - - - - - - - - - ORACLE - trabalhadores_ecd_id_seq - 1 - - - - - - - - - - ORACLE - trabalhadores_ecds_id_seq - 1 - - - - - - - - - - - - - - - - - - - ORACLE - trabalhadores_ecds_datas_id_seq - 1 - - - - - - - - - - - ORACLE - trabalhadores_ecds_datas_emails_id_seq - 1 - - - - - - - - ORACLE - trabalhadores_ecds_datas_observacoes_id_seq - 1 - - - - - - - - ORACLE - trabalhadores_fichas_aptidao_id_seq - 1 - - - - - - - - - - - - - ORACLE - trabalhadores_processo_id_seq - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/trunk/SIPRPSoft/src/cayenne.xml b/trunk/SIPRPSoft/src/cayenne.xml deleted file mode 100644 index 577924fb..00000000 --- a/trunk/SIPRPSoft/src/cayenne.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/trunk/SIPRPSoft/src/log4j.properties b/trunk/SIPRPSoft/src/log4j.properties deleted file mode 100644 index 3a9b9feb..00000000 --- a/trunk/SIPRPSoft/src/log4j.properties +++ /dev/null @@ -1,3 +0,0 @@ -log4j.rootCategory=ERROR, dest1 -log4j.appender.dest1=org.apache.log4j.ConsoleAppender -log4j.appender.dest1.layout=org.apache.log4j.PatternLayout diff --git a/trunk/SIPRPSoft/src/siprp/ui/SIPRPEditorWindow.java b/trunk/SIPRPSoft/src/siprp/ui/SIPRPEditorWindow.java deleted file mode 100644 index a43951c5..00000000 --- a/trunk/SIPRPSoft/src/siprp/ui/SIPRPEditorWindow.java +++ /dev/null @@ -1,27 +0,0 @@ -package siprp.ui; - -import com.evolute.utils.ui.window.EditorWindow; - -public class SIPRPEditorWindow extends EditorWindow -{ - private static final long serialVersionUID = 1L; - - public SIPRPEditorWindow() throws Exception - { - super(); - centerLater(); - } - - public SIPRPEditorWindow( boolean[][] permittedActions ) throws Exception - { - super( permittedActions ); - centerLater(); - } - - public SIPRPEditorWindow( int[][] permittedActions ) throws Exception - { - super( permittedActions ); - centerLater(); - } - -} diff --git a/trunk/SIPRPSoft/src/siprp/update/UpdateList.java b/trunk/SIPRPSoft/src/siprp/update/UpdateList.java index 5fc6dbf4..6370a97c 100644 --- a/trunk/SIPRPSoft/src/siprp/update/UpdateList.java +++ b/trunk/SIPRPSoft/src/siprp/update/UpdateList.java @@ -22,52 +22,6 @@ import com.evolute.module.updater.AbstractUpdate; */ public class UpdateList { - // OBSOLETE! -// private static final AbstractUpdate UPDATE_LIST[] = -// new AbstractUpdate[]{ -// new V6_1_To_V7_0(), new V7_0_To_V7_2(), -// new V7_2_To_V7_4(), new V7_4_To_V7_5(), -// new V7_5_To_V7_6(), new V7_6_To_V7_7(), -// new V7_7_To_V7_8(), new V7_8_To_V7_9(), -// new V7_9_To_V8_0(), new V8_0_To_V8_1(), -// new V8_1_To_V8_2(), new V8_2_To_V8_3(), -// new V8_3_To_V8_4(), new V8_4_To_V8_5(), -// new V8_5_To_V8_6(), new V8_6_To_V8_7(), -// new V8_7_To_V8_8(), new V8_8_To_V8_9(), -// new V8_9_To_V9_0(), new V9_0_To_V9_1(), -// new V9_1_To_V9_2(), new V9_2_To_V9_3(), -// new V9_3_To_V9_4(), new V9_4_To_V9_5(), -// new V9_5_To_V9_6(), new V9_6_To_V9_7(), -// new V9_7_To_V9_8(), new V9_8_To_V9_9(), -// new V9_9_To_V10_0(), new V10_0_To_V10_1(), -// new V10_1_To_V10_2(), new V10_2_To_V10_3(), -// new V10_3_To_V10_4(), new V10_4_To_V10_5(), -// new V10_5_To_V10_6(), new V10_6_To_V10_7(), -// new V10_7_To_V10_8(), new V10_8_To_V10_9(), -// new V10_9_To_V11_0(), new V11_0_To_V11_1(), -// new V11_1_To_V11_2(), new V11_2_To_V11_3(), -// new V11_3_To_V11_4(), new V11_4_To_V11_5(), -// new V11_5_To_V11_6(), new V11_6_To_V11_7(), -// new V11_7_To_V11_8(), new V11_8_To_V11_9(), -// new V11_9_To_V12_0(), new V12_0_To_V12_1(), -// new V12_1_To_V12_2(), new V12_2_To_V12_3(), -// new V12_3_To_V12_4(), new V12_4_To_V12_5(), -// new V12_5_To_V12_6(), new V12_6_To_V12_7(), -// new V12_7_To_V12_8(), new V12_8_To_V12_9(), -// new V12_9_To_V13_0(), new V13_0_To_V13_1(), -// new V13_1_To_V13_2(), new V13_2_To_V13_3(), -// new V13_3_To_V13_4(), -// new EvoCursosInstallUpdate( 13.4, 13.5 ), -// new EvoCursosUpdate1( 13.5, 13.6 ), -// new EvoCursosUpdate2( 13.6, 13.7 ), -// new V13_7_To_V13_8(), -// new SHSTUpdate8( 13.8, 13.9 ), -// new SHSTUpdate9( 13.9, 14.1 ), -// new V14_1_To_V14_2(), -// new V14_2_To_V14_3(), -// new SHSTUpdate11( 14.3, 14.4 ), new SHSTUpdate12( 14.4, 14.5 ), -// // OBSOLETE! do not add updates -> use SHST instead -// }; public static List getUpdates() { diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V10_0_To_V10_1.java b/trunk/SIPRPSoft/src/siprp/update/updates/V10_0_To_V10_1.java deleted file mode 100644 index 5c1a794c..00000000 --- a/trunk/SIPRPSoft/src/siprp/update/updates/V10_0_To_V10_1.java +++ /dev/null @@ -1,36 +0,0 @@ -package siprp.update.updates; - -import com.evolute.module.updater.AbstractUpdate; -import com.evolute.utils.db.Executer; - -public class V10_0_To_V10_1 extends AbstractUpdate -{ - - public V10_0_To_V10_1() - { - super(10.0,10.1,"Adicionadas normalizacoes para estabelecimentos e empresas"); - } - - @Override - public void doUpdate() throws Exception - { - Executer executer = getExecuter(); - com.evolute.utils.sql.Update update = - new com.evolute.utils.sql.Update( - "CREATE TABLE hs_normalizacao_empresa " + - "( " + - " normalizacao_id int4 REFERENCES hs_normalizacao(id), " + - " empresa_id int4 REFERENCES empresas(id), " + - " CONSTRAINT hs_normalizacao_empresa_pkey PRIMARY KEY(normalizacao_id,empresa_id) " + - "); " + - "CREATE TABLE hs_normalizacao_estabelecimento " + - "( " + - " normalizacao_id int4 REFERENCES hs_normalizacao(id), " + - " estabelecimento_id int4 REFERENCES estabelecimentos(id), " + - " CONSTRAINT hs_normalizacao_estabelecimento_pkey PRIMARY KEY(normalizacao_id,estabelecimento_id) " + - ");" - ); - executer.executeQuery( update ); - } - -} diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V10_1_To_V10_2.java b/trunk/SIPRPSoft/src/siprp/update/updates/V10_1_To_V10_2.java deleted file mode 100644 index 659e2776..00000000 --- a/trunk/SIPRPSoft/src/siprp/update/updates/V10_1_To_V10_2.java +++ /dev/null @@ -1,43 +0,0 @@ -package siprp.update.updates; - -import com.evolute.module.updater.AbstractUpdate; -import com.evolute.utils.db.Executer; - -public class V10_1_To_V10_2 extends AbstractUpdate -{ - - public V10_1_To_V10_2() - { - super(10.1,10.2,"Adicionadas normalizacoes para estabelecimentos e empresas"); - } - - @Override - public void doUpdate() throws Exception - { - Executer executer = getExecuter(); - com.evolute.utils.sql.Update update = - new com.evolute.utils.sql.Update( - "CREATE TABLE hs_equipamento( " + - "id SERIAL PRIMARY KEY, " + - "tipo VARCHAR(512) NOT NULL, " + - "marca VARCHAR(255), " + - "modelo VARCHAR(255), " + - "deleted_date TIMESTAMP " + - "); " + - "CREATE TABLE hs_relatorio_equipamento( " + - "hs_relatorio_id INT4 REFERENCES hs_relatorio(id), " + - "hs_equipamento INT4 REFERENCES hs_equipamento(id), " + - "CONSTRAINT hs_relatorio_equipamento_pkey PRIMARY KEY (hs_relatorio_id,hs_equipamento) " + - "); " + - "INSERT INTO hs_equipamento(id, tipo) " + - "SELECT id, nome FROM hs_equipamento_medico ; " + - "INSERT INTO hs_relatorio_equipamento(hs_relatorio_id, hs_equipamento) " + - "SELECT hs_relatorio_id, hs_equipamento_medico_id FROM hs_relatorio_equipamento_medico; " + - "DROP TABLE hs_relatorio_equipamento_medico; " + - "DROP TABLE hs_equipamento_medico; " + - "SELECT setval('hs_equipamento_id_seq',1000);" - ); - executer.executeQuery( update ); - } - -} diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V10_2_To_V10_3.java b/trunk/SIPRPSoft/src/siprp/update/updates/V10_2_To_V10_3.java deleted file mode 100644 index 04c13969..00000000 --- a/trunk/SIPRPSoft/src/siprp/update/updates/V10_2_To_V10_3.java +++ /dev/null @@ -1,46 +0,0 @@ -package siprp.update.updates; - -import com.evolute.module.updater.AbstractUpdate; -import com.evolute.utils.db.Executer; - -public class V10_2_To_V10_3 extends AbstractUpdate -{ - - public V10_2_To_V10_3() - { - super(10.2,10.3,"adicionadas normalizacoes duplicadas para planos de actuacao", - "adicionados campos aos tecnicos de higiene e seguranca"); - } - - @Override - public void doUpdate() throws Exception - { - Executer executer = getExecuter(); - com.evolute.utils.sql.Update update = - new com.evolute.utils.sql.Update( - "alter table hs_relatorio_equipamento drop constraint hs_relatorio_equipamento_hs_equipamento_fkey; " + - "alter table hs_relatorio_equipamento drop constraint hs_relatorio_equipamento_pkey; " + - "alter table hs_relatorio_equipamento add column id serial PRIMARY KEY; " + - "alter table hs_relatorio_equipamento add column tipo varchar(512); " + - "alter table hs_relatorio_equipamento add column marca varchar(256); " + - "alter table hs_relatorio_equipamento add column modelo varchar(256); " + - "select setval('hs_relatorio_equipamento_id_seq',1000);" + - "alter table hs_relatorio_legislacao drop constraint hs_relatorio_legislacao_hs_legislacao_id_fkey; " + - "alter table hs_relatorio_legislacao drop constraint hs_relatorio_legislacao_pkey; " + - "alter table hs_relatorio_legislacao add column id serial PRIMARY KEY; " + - "alter table hs_relatorio_legislacao add column categoria varchar(255); " + - "alter table hs_relatorio_legislacao add column descricao varchar(1024); " + - "alter table hs_relatorio_normalizacao drop constraint hs_relatorio_normalizacao_hs_normalizacao_id_fkey; " + - "alter table hs_relatorio_normalizacao drop constraint hs_relatorio_normalizacao_pkey; " + - "alter table hs_relatorio_normalizacao add column id serial PRIMARY KEY; " + - "alter table hs_relatorio_normalizacao add column codigo varchar(128) NOT NULL; " + - "alter table hs_relatorio_normalizacao add column descricao varchar(1024); " + - "alter table hs_relatorio_normalizacao add column portuguesa boolean NOT NULL; " + - "alter table marcacoes_tecnicos_hst add column cap varchar(128); " + - "alter table marcacoes_tecnicos_hst add column formacao varchar(128); " + - "alter table marcacoes_tecnicos_hst add column assinatura int4 REFERENCES image(id); " - ); - executer.executeQuery( update ); - } - -} diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V10_3_To_V10_4.java b/trunk/SIPRPSoft/src/siprp/update/updates/V10_3_To_V10_4.java deleted file mode 100644 index 2ea3c95f..00000000 --- a/trunk/SIPRPSoft/src/siprp/update/updates/V10_3_To_V10_4.java +++ /dev/null @@ -1,25 +0,0 @@ -package siprp.update.updates; - -import com.evolute.module.updater.AbstractUpdate; -import com.evolute.utils.db.Executer; - -public class V10_3_To_V10_4 extends AbstractUpdate -{ - - public V10_3_To_V10_4() - { - super(10.3,10.4,"Adicionado campo a empresa (Imprimir tabela alargada)"); - } - - @Override - public void doUpdate() throws Exception - { - Executer executer = getExecuter(); - com.evolute.utils.sql.Update update = - new com.evolute.utils.sql.Update( - "alter table empresas add column imprimir_tabela_alargada boolean;" - ); - executer.executeQuery( update ); - } - -} diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V10_4_To_V10_5.java b/trunk/SIPRPSoft/src/siprp/update/updates/V10_4_To_V10_5.java deleted file mode 100644 index f2abdbdc..00000000 --- a/trunk/SIPRPSoft/src/siprp/update/updates/V10_4_To_V10_5.java +++ /dev/null @@ -1,56 +0,0 @@ -package siprp.update.updates; - -import com.evolute.module.updater.AbstractUpdate; -import com.evolute.utils.db.Executer; - -public class V10_4_To_V10_5 extends AbstractUpdate -{ - - public V10_4_To_V10_5() - { - super(10.4,10.5,"Remocao dos dados de teste dos relatorio de higiene e seguranca"); - } - - @Override - public void doUpdate() throws Exception - { - Executer executer = getExecuter(); - com.evolute.utils.sql.Update update = - new com.evolute.utils.sql.Update( - "delete from hs_relatorio_posto_risco; " + - "delete from hs_relatorio_posto_medida; " + - "delete from hs_relatorio_posto; " + - "delete from hs_relatorio_medida; " + - "delete from hs_relatorio_area; " + - "delete from hs_relatorio_risco; " + - "delete from hs_relatorio_risco_valor_qualitativo; " + - "delete from hs_relatorio_normalizacao; " + - "delete from hs_relatorio_legislacao; " + - "delete from hs_relatorio_equipamento; " + - "delete from hs_relatorio; " + - "delete from hs_email_estabelecimento; " + - "delete from hs_email_empresa; " + - "delete from hs_email; " + - "delete from hs_equipamento; " + - "delete from hs_posto_risco; " + - "delete from hs_posto_medida; " + - "delete from hs_posto_estabelecimento; " + - "delete from hs_posto; " + - "delete from hs_area; " + - "delete from hs_legislacao_estabelecimento; " + - "delete from hs_legislacao_empresa; " + - "delete from hs_legislacao; " + - "delete from hs_legislacao_categoria; " + - "delete from hs_risco_empresa; " + - "delete from hs_risco_medida; " + - "delete from hs_medida; " + - "delete from hs_risco; " + - "delete from hs_risco_tema; " + - "delete from hs_normalizacao_estabelecimento; " + - "delete from hs_normalizacao_empresa; " + - "delete from hs_normalizacao; " - ); - executer.executeQuery( update ); - } - -} diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V10_5_To_V10_6.java b/trunk/SIPRPSoft/src/siprp/update/updates/V10_5_To_V10_6.java deleted file mode 100644 index 71f7174d..00000000 --- a/trunk/SIPRPSoft/src/siprp/update/updates/V10_5_To_V10_6.java +++ /dev/null @@ -1,29 +0,0 @@ -package siprp.update.updates; - - -import shst.higiene.gestao.importacao.Importador; - -import com.evolute.module.updater.AbstractUpdate; -import com.evolute.utils.db.Executer; - -public class V10_5_To_V10_6 extends AbstractUpdate -{ - - public V10_5_To_V10_6() - { - super(10.5,10.6,"Importa\u00e7\u00e3o de riscos e medidas"); - } - - @Override - public void doUpdate() throws Exception - { - Executer executer = getExecuter(); - com.evolute.utils.sql.Update update = - new com.evolute.utils.sql.Update( "alter table hs_medida alter column description type character varying(8192);"); - executer.executeQuery( update ); - update = new com.evolute.utils.sql.Update( "alter table hs_medida alter column requesitos_legais type character varying(8192);"); - executer.executeQuery( update ); - new Importador( executer ).importar(); - } - -} diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V10_6_To_V10_7.java b/trunk/SIPRPSoft/src/siprp/update/updates/V10_6_To_V10_7.java deleted file mode 100644 index ba4a776b..00000000 --- a/trunk/SIPRPSoft/src/siprp/update/updates/V10_6_To_V10_7.java +++ /dev/null @@ -1,34 +0,0 @@ -package siprp.update.updates; - -import com.evolute.module.updater.AbstractUpdate; -import com.evolute.utils.db.Executer; - -public class V10_6_To_V10_7 extends AbstractUpdate -{ - - public V10_6_To_V10_7() - { - super(10.6,10.7,"Alteracao de tamanho maximo em campos de descricao"); - } - - @Override - public void doUpdate() throws Exception - { - Executer executer = getExecuter(); - com.evolute.utils.sql.Update update = - new com.evolute.utils.sql.Update( - "alter table hs_risco alter column description type varchar(8192); " + - "alter table hs_relatorio_risco alter column description type varchar(8192); " + - "alter table hs_normalizacao alter column descricao type varchar(8192); " + - "alter table hs_relatorio_normalizacao alter column descricao type varchar(8192); " + - "alter table hs_legislacao alter column description type varchar(8192); " + - "alter table hs_relatorio_legislacao alter column descricao type varchar(8192); " + - "alter table hs_area alter column description type varchar(1024); " + - "alter table hs_relatorio_area alter column description type varchar(1024); " + - "alter table hs_posto alter column description type varchar(1024); " + - "alter table hs_relatorio_posto alter column description type varchar(1024); " - ); - executer.executeQuery( update ); - } - -} diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V10_7_To_V10_8.java b/trunk/SIPRPSoft/src/siprp/update/updates/V10_7_To_V10_8.java deleted file mode 100644 index dadebe7b..00000000 --- a/trunk/SIPRPSoft/src/siprp/update/updates/V10_7_To_V10_8.java +++ /dev/null @@ -1,30 +0,0 @@ -package siprp.update.updates; - -import com.evolute.module.updater.AbstractUpdate; -import com.evolute.utils.db.Executer; - -public class V10_7_To_V10_8 extends AbstractUpdate -{ - - public V10_7_To_V10_8() - { - super(10.7,10.8,"relatorio de higiene e seguranca: insercao de valores qualitativos"); - } - - @Override - public void doUpdate() throws Exception - { - Executer executer = getExecuter(); - com.evolute.utils.sql.Update update = - new com.evolute.utils.sql.Update( - "insert into hs_relatorio_risco_valor_qualitativo(description) " + - "values('Controlado'); " + - "insert into hs_relatorio_risco_valor_qualitativo(description) " + - "values('Incontrolado'); " + - "insert into hs_relatorio_risco_valor_qualitativo(description)" + - "values('Indeterminado'); " - ); - executer.executeQuery( update ); - } - -} diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V10_8_To_V10_9.java b/trunk/SIPRPSoft/src/siprp/update/updates/V10_8_To_V10_9.java deleted file mode 100644 index c501a850..00000000 --- a/trunk/SIPRPSoft/src/siprp/update/updates/V10_8_To_V10_9.java +++ /dev/null @@ -1,26 +0,0 @@ -package siprp.update.updates; - -import com.evolute.module.updater.AbstractUpdate; -import com.evolute.utils.db.Executer; - -public class V10_8_To_V10_9 extends AbstractUpdate -{ - - public V10_8_To_V10_9() - { - super(10.8,10.9,"relatorio de higiene e seguranca: aumentada a capacidade de texto das requesitos(relatorio)"); - } - - @Override - public void doUpdate() throws Exception - { - Executer executer = getExecuter(); - com.evolute.utils.sql.Update update = - new com.evolute.utils.sql.Update( - "alter table hs_relatorio_medida alter column description type varchar(8192); " + - "alter table hs_relatorio_medida alter column requesitos_legais type varchar(8192);" - ); - executer.executeQuery( update ); - } - -} diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V10_9_To_V11_0.java b/trunk/SIPRPSoft/src/siprp/update/updates/V10_9_To_V11_0.java deleted file mode 100644 index 25278416..00000000 --- a/trunk/SIPRPSoft/src/siprp/update/updates/V10_9_To_V11_0.java +++ /dev/null @@ -1,25 +0,0 @@ -package siprp.update.updates; - -import com.evolute.module.updater.AbstractUpdate; -import com.evolute.utils.db.Executer; - -public class V10_9_To_V11_0 extends AbstractUpdate -{ - - public V10_9_To_V11_0() - { - super(10.9,11.0,"relatorio de higiene e seguranca: adicionado campo 'funcionarios'"); - } - - @Override - public void doUpdate() throws Exception - { - Executer executer = getExecuter(); - com.evolute.utils.sql.Update update = - new com.evolute.utils.sql.Update( - "alter table hs_relatorio add column funcionarios varchar(8192); " - ); - executer.executeQuery( update ); - } - -} diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V11_0_To_V11_1.java b/trunk/SIPRPSoft/src/siprp/update/updates/V11_0_To_V11_1.java deleted file mode 100644 index 51327a58..00000000 --- a/trunk/SIPRPSoft/src/siprp/update/updates/V11_0_To_V11_1.java +++ /dev/null @@ -1,98 +0,0 @@ -package siprp.update.updates; - -import static com.evolute.utils.strings.UnicodeLatin1Map.atilde; -import static com.evolute.utils.strings.UnicodeLatin1Map.ccedil; -import static com.evolute.utils.strings.UnicodeLatin1Map.oacute; -import static com.evolute.utils.strings.UnicodeLatin1Map.uacute; - -import java.awt.image.BufferedImage; -import java.io.ByteArrayOutputStream; - -import javax.imageio.ImageIO; - -import com.evolute.module.updater.AbstractUpdate; -import com.evolute.utils.arrays.Virtual2DArray; -import com.evolute.utils.db.Executer; -import com.evolute.utils.sql.Assignment; -import com.evolute.utils.sql.BlobUpdate; -import com.evolute.utils.sql.Field; -import com.evolute.utils.sql.Insert; -import com.evolute.utils.sql.Select2; -import com.evolute.utils.sql.Update; - -public class V11_0_To_V11_1 extends AbstractUpdate -{ - - public V11_0_To_V11_1() - { - super(11.0,11.1,"A actualizar informacao dos tecnicos de higiene e seguranca"); - } - - @Override - public void doUpdate() throws Exception - { - Executer executer = getExecuter(); - - Update update = new Update( - "alter table image alter column image_data drop not null; " - ); - executer.executeQuery( update ); - - Integer assSoniaID = null; - Integer assCatarinaID = null; - String assSonia = "Assinatura(Sonia Filipa Dias Campos)"; - String assCatarina = "Assinatura(Catarina Leonardo)"; - BufferedImage assSoniaImage = ImageIO.read( getClass().getClassLoader().getResourceAsStream( "siprp/update/updates/V11_0_To_V11_1_Assinatura_Sonia.png" ) ); - BufferedImage assCatarinaImage = ImageIO.read( getClass().getClassLoader().getResourceAsStream( "siprp/update/updates/V11_0_To_V11_1_Assinatura_Catarina.png" ) ); - ByteArrayOutputStream assSoniaBytesStream = new ByteArrayOutputStream(); - ByteArrayOutputStream assCatarinaBytesStream = new ByteArrayOutputStream(); - ImageIO.write( assSoniaImage, "PNG", assSoniaBytesStream ); - ImageIO.write( assCatarinaImage, "PNG", assCatarinaBytesStream ); - if( assSoniaImage == null || assSoniaBytesStream.size() == 0 ) - { - throw new Exception("Erro ao ler assinatura: " + assSonia ); - } - if( assCatarinaImage == null || assCatarinaBytesStream.size() == 0 ) - { - throw new Exception("Erro ao ler assinatura: " + assCatarina ); - } - Insert insertQuery = new Insert( "image", new Assignment[]{ - new Assignment(new Field("name"),assSonia) - } ); - Virtual2DArray array = executer.executeQuery( insertQuery ); - insertQuery = new Insert( "image", new Assignment[]{ - new Assignment(new Field("name"), assCatarina) - } ); - executer.executeQuery( insertQuery ); - Select2 selectQuery = new Select2(new String[]{"image"},null,null,new String[]{"id"},new Field("name").isEqual( assSonia ),null,null,null,null); - array = executer.executeQuery( selectQuery ); - if( array.columnLength() == 1 ) - { - assSoniaID = (Integer) array.get( 0, 0 ); - } - selectQuery = new Select2(new String[]{"image"},null,null,new String[]{"id"},new Field("name").isEqual( assCatarina ),null,null,null,null); - array = executer.executeQuery( selectQuery ); - if( array.columnLength() == 1 ) - { - assCatarinaID = (Integer) array.get( 0, 0 ); - } - if( assSoniaID == null ) - { - throw new Exception("Erro ao inserir assinatura: " + assSonia ); - } - if( assCatarinaID == null ) - { - throw new Exception("Erro ao inserir assinatura: " + assCatarina ); - } - BlobUpdate blobUpdate = new BlobUpdate("image","image_data",assSoniaBytesStream.toByteArray(),new Field("id").isEqual( assSoniaID ) ); - executer.executeQuery( blobUpdate ); - blobUpdate = new BlobUpdate("image","image_data",assCatarinaBytesStream.toByteArray(),new Field("id").isEqual( assCatarinaID ) ); - executer.executeQuery( blobUpdate ); - update = new Update( - "update marcacoes_tecnicos_hst set cap='0601/6505/02', formacao='Ergonomia', assinatura=" + assSoniaID + " where id = 2; " + - "update marcacoes_tecnicos_hst set cap='0310/1156/02', formacao='Sa"+uacute+"de Ambiental, P"+oacute+"s Gradua"+ccedil+atilde+"o em Higiene e Seguran"+ccedil+"a do Trabalho e Mestrado em Ergonomia na Seguran"+ccedil+"a do Trabalho', assinatura=" + assCatarinaID + " where id = 1; " - ); - executer.executeQuery( update ); - } - -} diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V11_0_To_V11_1_Assinatura_Catarina.png b/trunk/SIPRPSoft/src/siprp/update/updates/V11_0_To_V11_1_Assinatura_Catarina.png deleted file mode 100644 index 506cb2b910a482a8d24d94d0549b53bad6ea352c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3247 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 diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V11_0_To_V11_1_Assinatura_Sonia.png b/trunk/SIPRPSoft/src/siprp/update/updates/V11_0_To_V11_1_Assinatura_Sonia.png deleted file mode 100644 index 0db7ac3330acec1fe6a0ff472f3c867a38554ea0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8975 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

#I_Ie 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 diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V11_9_To_V11_10_Ana_Sofia_Jorge.png b/trunk/SIPRPSoft/src/siprp/update/updates/V11_9_To_V11_10_Ana_Sofia_Jorge.png deleted file mode 100644 index 7dfee8e289b5cdb2e238228ba1869753db2c33de..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9761 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 diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V11_9_To_V11_10_Barbara_Goncalves.png b/trunk/SIPRPSoft/src/siprp/update/updates/V11_9_To_V11_10_Barbara_Goncalves.png deleted file mode 100644 index 1e5fa9e7d7dc2b587434c838f291564a70c9d0a8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 19985 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 assignments = new Vector(); - assignments.add( new Assignment( "cap", caps[ n ] ) ); - if( assinaturas[ n ] != null ) - { - Integer assinaturaID = null; - String assinatura = "Assinatura(" + nomes[ n ] + ")"; - BufferedImage assinaturaImage = ImageIO.read( getClass().getClassLoader().getResourceAsStream( - assinaturas[ n ] ) ); - ByteArrayOutputStream assinaturaBytesStream = new ByteArrayOutputStream(); - ImageIO.write( assinaturaImage, "PNG", assinaturaBytesStream ); - if( assinaturaImage == null || assinaturaBytesStream.size() == 0 ) - { - throw new Exception("Erro ao ler assinatura: " + assinatura ); - } - Insert insertQuery = new Insert( "image", new Assignment[]{ - new Assignment(new Field("name"),assinatura) - } ); - Virtual2DArray array = executer.executeQuery( insertQuery ); - Select2 selectQuery = new Select2(new String[]{"image"},null,null,new String[]{"id"},new Field("name").isEqual( assinatura ),null,null,null,null); - array = executer.executeQuery( selectQuery ); - if( array.columnLength() == 1 ) - { - assinaturaID = (Integer) array.get( 0, 0 ); - } - if( assinaturaID == null ) - { - throw new Exception("Erro ao inserir assinatura: " + assinatura ); - } - BlobUpdate blobUpdate = new BlobUpdate("image","image_data",assinaturaBytesStream.toByteArray(),new Field("id").isEqual( assinaturaID ) ); - executer.executeQuery( blobUpdate ); - assignments.add( new Assignment( "assinatura", assinaturaID ) ); - } - Update update = - new Update( "marcacoes_tecnicos_hst", - assignments.toArray( new Assignment[ assignments.size() ] ), - new Field( "id" ).isEqual( ids[ n ] ) ); - executer.executeQuery( update ); - } - } - -} diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V12_0_To_V12_1.java b/trunk/SIPRPSoft/src/siprp/update/updates/V12_0_To_V12_1.java deleted file mode 100644 index ad7c60c8..00000000 --- a/trunk/SIPRPSoft/src/siprp/update/updates/V12_0_To_V12_1.java +++ /dev/null @@ -1,54 +0,0 @@ -package siprp.update.updates; - -import java.awt.image.BufferedImage; -import java.io.ByteArrayOutputStream; -import java.util.Vector; - -import javax.imageio.ImageIO; - -import com.evolute.module.updater.AbstractUpdate; -import com.evolute.utils.db.Executer; -import com.evolute.utils.sql.Assignment; -import com.evolute.utils.sql.BlobUpdate; -import com.evolute.utils.sql.Field; - -public class V12_0_To_V12_1 extends AbstractUpdate -{ - - public V12_0_To_V12_1() - { - super(12.0,12.1,"A actualizar assinatura de B\u00e1rbara Gon\u00e7alves"); - } - - @Override - public void doUpdate() throws Exception - { - Executer executer = getExecuter(); - - Integer ids[] = new Integer[]{ - 129, - }; - String assinaturas[] = new String[]{ - "siprp/update/updates/V12_0_To_V12_1_Barbara_Goncalves.png" - }; - - for( int n = 0; n < ids.length; n++ ) - { - Vector assignments = new Vector(); - if( assinaturas[ n ] != null ) - { - Integer assinaturaID = null; - BufferedImage assinaturaImage = ImageIO.read( getClass().getClassLoader().getResourceAsStream( - assinaturas[ n ] ) ); - ByteArrayOutputStream assinaturaBytesStream = new ByteArrayOutputStream(); - ImageIO.write( assinaturaImage, "PNG", assinaturaBytesStream ); - - BlobUpdate blobUpdate = new BlobUpdate("image","image_data",assinaturaBytesStream.toByteArray(),new Field("id").isEqual( ids[ n ] ) ); - executer.executeQuery( blobUpdate ); - assignments.add( new Assignment( "assinatura", assinaturaID ) ); - } - - } - } - -} diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V12_0_To_V12_1_Barbara_Goncalves.png b/trunk/SIPRPSoft/src/siprp/update/updates/V12_0_To_V12_1_Barbara_Goncalves.png deleted file mode 100644 index e3b30a8345fc0a2d979203ec9113fba5a6a193bc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9934 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�fY;?RGU+^vc{SA%l1Kn@kP?WXP>^noXR~zbt?N%5-fZX$ffE7&={gHXoy$wB zY#`06dXQsT$P9+^WKh#q8p2F6a+dc^(V^np=(GOIH9pHsoM7 zrIP@%*%C4W!f3?xM}K(e|NQ8!>%%jhU7`Ahh_33%WWK)6)wL-E2!}tn6+p(q?rmE` z=~UkD_Bu4SZA)_`96Ww}?D-eY)P)+{ZWrU&(HZXR^+&@_Zd2PB06=5RX#R4~ay;L(e7r*z%`vU<30Hok&&P+Ep z#8Qd8SuO?rf&P9k0|J0@StuMxl4X|55>LH7v$D9<*Vk1R@aCzB2ljVu9jZTa%s(}i ziZ7J{LDzlvMg0L?O4q_-LF@uVK*mUt-|u?r$=-(_>iWsgPOhFRd3?&@&kYr`A`o!E z20q+6{+!KED-=vk(}uP*y>)Wr%C-4j+bf^~p>la-p?gykXDES6B`_Qg{I8;MA$9<;6l~H4%(B8e-A*_MlBp^7%C>N!Re<2RkhQMIuNd z63tEe*M6@*vC^@!lGk(|3^;=U4J9WKw#wOG+|yl$Om<4w?p>{kc#cUlTn^2_7)Ky7 z9Ga^ogq6qa-TcR}m#@$0+W zbl%eni9muiJ6HU{-=6;V_jWecd+elzp`2fq&;IkJuYP5-%dPzArxzBcmOH!KonGhY zwTZfj?+Z_D%Vew{|LD!bpYQK%k4}!KUq5OOB9A%2RK| z_dXa1dNcycm&EtK|N6{KJ`nOc4b0~YKEJoCBkXlJ_8({oQjq2}ZU={uoiHWJ)KmPE{j_utp2f935QIvQ} zEG?#Y@2G2Ub0L5w*!hv^g}JPP)YcK}>I~~j86>@aV)4zhqYj4k_1-O8+c)=yNrEIx z;S8`stC1Ccp#%#+!3w36KuXEEa_Wh%W=U;hJ(6f z%FJx)+SSxjJnr{-hx)?xO&-oTV+aK05}Bsybg9TVkYyEtRN@@x7xS+k8Aj5&dg=%J zqF#gBiM<4}V|fyitJ-TPZ(KMtZ|I80?I0-ygM;@Cw6`;cIsuU^17~AntGTRID&<2V zPbBJgdo(T?kwlK~%Mh@4O-jKkjC1x0H`jesjbh7-g&+U)?05fopWC7S2Jg?Umj2uS zc=a1!-`Cz2_;fD7Jq&C^SCvJDv2pX-)rkiVZkd};XVN9hvOEsGt1D!9*4lsXY^|>t z03tv#vFi1CxdK)0eDy3uz;#q!M6CAT;2IH^s^{ptn*VLGJ>9F7^)8dF<}?UUX$HEZ z@2FBySv!;wiDdQS654PiQssgHsNSKl?%p3n3B(r{vU4kGzu(u^?8Zvt#vNTBh@WWE0gqSxbY78mZx6Qq zI3!_7CT;y>$n3@##!MjqQDuzX?#sfeVF04dr9oLCDw53!wr#@JaHv=@RBw~0Dm<+N z2LRu{)p6aeA@Ah1mFnKQu6A0(1*)^IP^3OU2j^$gU%_4IC`nn-0QMUh*urxD`Tu+7>%Y6#Fg`m5 zw&5~V6aWll6>qsC>Y{gPGN(12mNthK5diq7zW)lL__yjm}-(t>+@g4|6eq$ z(zU;_4XkEf_wZmJ29T(_L8k_Ki2*Vz=l=Ab?WgOoIZ$vtddtCBGISu{CZauQA#PL%x1G5 zkB2cz-m&HnpEZg0ZNi7?s=}~a{vGU M07*qoM6N<$g1&&(dH?_b diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V12_1_To_V12_2.java b/trunk/SIPRPSoft/src/siprp/update/updates/V12_1_To_V12_2.java deleted file mode 100644 index bb7a6174..00000000 --- a/trunk/SIPRPSoft/src/siprp/update/updates/V12_1_To_V12_2.java +++ /dev/null @@ -1,25 +0,0 @@ -package siprp.update.updates; - -import com.evolute.module.updater.AbstractUpdate; -import com.evolute.utils.sql.Update; - -public class V12_1_To_V12_2 extends AbstractUpdate -{ - - public V12_1_To_V12_2() - { - super(12.1,12.2, - "A corrigir a tabela de marcacoes de trabalhadores", - "A corrigir a tabela de avisos", - "A corrigir a tabela de exames"); - } - - @Override - public void doUpdate() throws Exception - { - executeQuery( new Update( "ALTER TABLE marcacoes_trabalhador ADD CONSTRAINT marcacoes_trabalhador_trabalhador_id_fkey FOREIGN KEY (trabalhador_id) REFERENCES trabalhadores (id); " ) ); - executeQuery( new Update( "ALTER TABLE avisos ADD CONSTRAINT avisos_trabalhador_id_fkey FOREIGN KEY (trabalhador_id) REFERENCES trabalhadores (id); " ) ); - executeQuery( new Update( "ALTER TABLE exames ADD CONSTRAINT exames_trabalhador_id_fkey FOREIGN KEY (trabalhador_id) REFERENCES trabalhadores(id); " ) ); - } - -} diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V12_2_To_V12_3.java b/trunk/SIPRPSoft/src/siprp/update/updates/V12_2_To_V12_3.java deleted file mode 100644 index c1e19a57..00000000 --- a/trunk/SIPRPSoft/src/siprp/update/updates/V12_2_To_V12_3.java +++ /dev/null @@ -1,45 +0,0 @@ -package siprp.update.updates; - -import com.evolute.module.updater.AbstractUpdate; -import com.evolute.utils.db.PSQLSequenceUtils; -import com.evolute.utils.sql.Update; - -public class V12_2_To_V12_3 extends AbstractUpdate -{ - - public V12_2_To_V12_3() - { - super( 12.2, 12.3, "A corrigir chaves primarias" ); - } - - @Override - public void doUpdate() throws Exception - { - fixIdColumn( "avisos", "id" ); - fixIdColumn( "contactos", "id" ); - fixIdColumn( "empresas", "id" ); - fixIdColumn( "estabelecimentos", "id" ); - fixIdColumn( "exames", "id" ); - fixIdColumn( "exames_perfis", "id" ); - fixIdColumn( "historico_estabelecimento", "id" ); - fixIdColumn( "marcacoes_empresa", "id" ); - fixIdColumn( "marcacoes_estabelecimento", "id" ); - fixIdColumn( "marcacoes_tecnicos_hst", "id" ); - fixIdColumn( "marcacoes_trabalhador", "id" ); - fixIdColumn( "medicos", "id" ); - fixIdColumn( "prt_grupos_protocolo", "id" ); - fixIdColumn( "prt_tipos_elementos_protocolo", "id" ); - fixIdColumn( "tipos_exames_comp", "id" ); - fixIdColumn( "trabalhadores", "id" ); - } - - private void fixIdColumn( String columnName, String idField ) throws Exception - { - executeQuery( new Update( - "create sequence " + columnName + "_" + idField + "_seq; " + - "alter table " + columnName + " alter column " + idField + " set default nextval(('" + columnName + "_" + idField + "_seq'::text)::regclass); " - ) ); - PSQLSequenceUtils.fixSequence( columnName, idField ); - } - -} diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V12_3_To_V12_4.java b/trunk/SIPRPSoft/src/siprp/update/updates/V12_3_To_V12_4.java deleted file mode 100644 index 2eb2dd92..00000000 --- a/trunk/SIPRPSoft/src/siprp/update/updates/V12_3_To_V12_4.java +++ /dev/null @@ -1,36 +0,0 @@ -package siprp.update.updates; - -import com.evolute.module.updater.AbstractUpdate; -import com.evolute.utils.sql.Update; - -public class V12_3_To_V12_4 extends AbstractUpdate -{ - - public V12_3_To_V12_4( ) - { - super( 12.3, 12.4, "Adicionar campos em algumas tabelas." ); - } - - @Override - public void doUpdate() throws Exception - { - - Update update = new Update( - "ALTER TABLE trabalhadores ADD COLUMN nif CHARACTER VARYING( 255 );" + - "ALTER TABLE trabalhadores ADD COLUMN numero_utente CHARACTER VARYING( 255 );" - ); - executeQuery( update ); - - update = new Update( - "ALTER TABLE marcacoes_trabalhador ADD COLUMN medico_id INTEGER;" + - "ALTER TABLE marcacoes_trabalhador ADD COLUMN inserted_stamp TIMESTAMP WITHOUT TIME ZONE DEFAULT now();" - ); - executeQuery( update ); - - update = new Update( - "ALTER TABLE empresas ADD COLUMN codigo_relatorio_unico CHARACTER VARYING( 64 );" - ); - executeQuery( update ); - } - -} diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V12_4_To_V12_5.java b/trunk/SIPRPSoft/src/siprp/update/updates/V12_4_To_V12_5.java deleted file mode 100644 index 711981c7..00000000 --- a/trunk/SIPRPSoft/src/siprp/update/updates/V12_4_To_V12_5.java +++ /dev/null @@ -1,52 +0,0 @@ -package siprp.update.updates; - -import com.evolute.module.updater.AbstractUpdate; -import com.evolute.utils.db.PSQLSequenceUtils; -import com.evolute.utils.sql.Update; - -public class V12_4_To_V12_5 extends AbstractUpdate -{ - - public V12_4_To_V12_5() - { - super( 12.4, 12.5, "A adicionar novos pagamentos por empresa" ); - } - - @Override - public void doUpdate() throws Exception - { - Update update = new Update( - "begin; " + - "create table empresa_preco_periodicidade_tipo( " + - " id serial primary key, " + - " nome varchar(64) not null " + - "); " + - "insert into empresa_preco_periodicidade_tipo(id,nome) values(1,'Anual'); " + - "insert into empresa_preco_periodicidade_tipo(id,nome) values(2,'Semestral'); " + - "insert into empresa_preco_periodicidade_tipo(id,nome) values(3,'Trimestral'); " + - "insert into empresa_preco_periodicidade_tipo(id,nome) values(4,'Mensal'); " + - "insert into empresa_preco_periodicidade_tipo(id,nome) values(5,'Pontual'); " + - "create table empresa_preco_servico_tipo( " + - " id serial primary key, " + - " nome varchar(64) not null " + - "); " + - "insert into empresa_preco_servico_tipo(id,nome) values(1,'Medicina'); " + - "insert into empresa_preco_servico_tipo(id,nome) values(2,'Higiene e Seguran\\\\u00e7a'); " + - "insert into empresa_preco_servico_tipo(id,nome) values(3,'Outro'); " + - "create table empresa_preco_servico( " + - " id serial primary key, " + - " empresa_preco_servico_tipo_id int4 not null references empresa_preco_servico_tipo(id), " + - " empresa_preco_periodicidade_tipo_id int4 references empresa_preco_periodicidade_tipo(id), " + - " tipo_outro varchar(64), " + - " empresa_id int4 not null references empresas(id), " + - " valor double precision, " + - " iniciado timestamp, " + - " activo boolean not null " + - "); " + - "commit; " ); - getExecuter().executeQuery( update ); - PSQLSequenceUtils.fixSequence("empresa_preco_periodicidade_tipo", "id"); - PSQLSequenceUtils.fixSequence("empresa_preco_servico_tipo", "id"); - } - -} diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V12_5_To_V12_6.java b/trunk/SIPRPSoft/src/siprp/update/updates/V12_5_To_V12_6.java deleted file mode 100644 index 1a5c40d6..00000000 --- a/trunk/SIPRPSoft/src/siprp/update/updates/V12_5_To_V12_6.java +++ /dev/null @@ -1,23 +0,0 @@ -package siprp.update.updates; - -import com.evolute.module.updater.AbstractUpdate; -import com.evolute.utils.sql.Update; - -public class V12_5_To_V12_6 extends AbstractUpdate -{ - - public V12_5_To_V12_6() - { - super( 12.5, 12.6, "Adicionar campos em algumas tabelas." ); - } - - @Override - public void doUpdate() throws Exception - { - Update update = new Update( - "ALTER TABLE exames ADD COLUMN impresso_stamp timestamp without time zone;" - ); - executeQuery( update ); - } - -} diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V12_6_To_V12_7.java b/trunk/SIPRPSoft/src/siprp/update/updates/V12_6_To_V12_7.java deleted file mode 100644 index 63bf0144..00000000 --- a/trunk/SIPRPSoft/src/siprp/update/updates/V12_6_To_V12_7.java +++ /dev/null @@ -1,22 +0,0 @@ -package siprp.update.updates; - -import com.evolute.module.updater.AbstractUpdate; -import com.evolute.sql.CreateFunctionPlainUpdate; - -public class V12_6_To_V12_7 extends AbstractUpdate -{ - - public V12_6_To_V12_7() - { - super( 12.6, 12.7, "Adicionar funcao plain()." ); - } - - @Override - public void doUpdate() throws Exception - { - - CreateFunctionPlainUpdate update = new CreateFunctionPlainUpdate( 12.6, 12.7 ); - update.doUpdate(); - } - -} diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V12_7_To_V12_8.java b/trunk/SIPRPSoft/src/siprp/update/updates/V12_7_To_V12_8.java deleted file mode 100644 index fa3bb2f8..00000000 --- a/trunk/SIPRPSoft/src/siprp/update/updates/V12_7_To_V12_8.java +++ /dev/null @@ -1,23 +0,0 @@ -package siprp.update.updates; - -import com.evolute.module.updater.AbstractUpdate; -import com.evolute.utils.sql.Update; - -public class V12_7_To_V12_8 extends AbstractUpdate -{ - - public V12_7_To_V12_8() - { - super( 12.7, 12.8, "Adicionar campo departamento em contactos." ); - } - - @Override - public void doUpdate() throws Exception - { - Update update = new Update( - "ALTER TABLE contactos ADD COLUMN departamento character varying( 256 );" - ); - executeQuery( update ); - } - -} diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V12_8_To_V12_9.java b/trunk/SIPRPSoft/src/siprp/update/updates/V12_8_To_V12_9.java deleted file mode 100644 index 494de270..00000000 --- a/trunk/SIPRPSoft/src/siprp/update/updates/V12_8_To_V12_9.java +++ /dev/null @@ -1,69 +0,0 @@ -package siprp.update.updates; - -import com.evolute.module.updater.AbstractUpdate; -import com.evolute.utils.db.DBException; -import com.evolute.utils.sql.EvoQuery; -import com.evolute.utils.sql.Insert; -import com.evolute.utils.sql.Select; -import com.evolute.utils.tables.ColumnizedIDObject; - -public class V12_8_To_V12_9 extends AbstractUpdate -{ - - public V12_8_To_V12_9() - { - super( 12.8, 12.9, "A converter valores de pagamentos antigos" ); - } - - @Override - public void doUpdate() throws Exception - { - EvoQuery select = new EvoQuery( getExecuter(), new Select( - "SELECT id, preco_medicina, " + - "CASE " + - "WHEN preco_medicina IS NULL THEN false " + - "ELSE true " + - "END AS preco_medicina_activo, " + - "preco_higiene, " + - "CASE " + - "WHEN preco_higiene IS NULL THEN false " + - "ELSE true " + - "END AS preco_higiene_activo " + - "FROM empresas" - )); - for( ColumnizedIDObject row : select ) - { - Integer empresaId = row.getID(); - -// Number precoFormacao = row.getValue( 0 ); -// Boolean activeFormacao = row.getValue( 1 ); - - Number precoMedicina = row.getValue( 0 ); -// Boolean activeMedicina = row.getValue( 1 ); - Boolean activeMedicina = true; - - Number precoHigiene = row.getValue( 2 ); -// Boolean activeHigiene = row.ge - Boolean activeHigiene = true; - - insertPreco( empresaId, /*precoFormacao, activeFormacao == null ? false : activeFormacao, */precoMedicina, activeMedicina == null ? false : activeMedicina, precoHigiene, activeHigiene == null ? false : activeHigiene); - } - - } - - private void insertPreco(Integer empresaId, /*Number precoFormacao, boolean activeFormacao,*/ Number precoMedicina, boolean activeMedicina, Number precoHigiene, boolean activeHigiene) throws DBException - { - Insert insert = new Insert("insert into empresa_preco_servico(" + - "empresa_preco_servico_tipo_id,empresa_id,valor,activo) " + - "values("+1+","+empresaId+", round( cast( "+precoMedicina+" AS numeric ), 3 ),"+activeMedicina+"); "); - getExecuter().executeQuery(insert); - insert = new Insert("insert into empresa_preco_servico(" + - "empresa_preco_servico_tipo_id,empresa_id,valor,activo) " + - "values("+2+","+empresaId+", round( cast( "+precoHigiene+" AS numeric ), 3 ),"+activeHigiene+"); "); - getExecuter().executeQuery(insert); -// insert = new Insert("insert into empresa_preco_servico(" + -// "empresa_preco_servico_tipo_id,empresa_id,valor,activo) " + -// "values("+3+","+empresaId+","+precoFormacao+","+activeFormacao+"); "); -// getExecuter().executeQuery(insert); - } -} diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V12_9_To_V13_0.java b/trunk/SIPRPSoft/src/siprp/update/updates/V12_9_To_V13_0.java deleted file mode 100644 index 304858ad..00000000 --- a/trunk/SIPRPSoft/src/siprp/update/updates/V12_9_To_V13_0.java +++ /dev/null @@ -1,28 +0,0 @@ -package siprp.update.updates; - -import com.evolute.module.updater.AbstractUpdate; -import com.evolute.utils.sql.Update; - -public class V12_9_To_V13_0 extends AbstractUpdate -{ - - public V12_9_To_V13_0() - { - super( 12.9, 13.0, "A remover valores de pagamentos antigos" ); - } - - @Override - public void doUpdate() throws Exception - { - Update update = new Update( - //"alter table empresas drop column preco_formacao; " + - //"alter table empresas drop column preco_formacao_activo; " + - "alter table empresas drop column preco_higiene; " + - //"alter table empresas drop column preco_higiene_activo; " + - "alter table empresas drop column preco_medicina; " - //"alter table empresas drop column preco_medicina_activo; " - ); - getExecuter().executeQuery( update ); - } - -} diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V13_0_To_V13_1.java b/trunk/SIPRPSoft/src/siprp/update/updates/V13_0_To_V13_1.java deleted file mode 100644 index f9811a77..00000000 --- a/trunk/SIPRPSoft/src/siprp/update/updates/V13_0_To_V13_1.java +++ /dev/null @@ -1,22 +0,0 @@ -package siprp.update.updates; - -import shst.update.updates.SHSTUpdate7; - -import com.evolute.module.updater.AbstractUpdate; - -public class V13_0_To_V13_1 extends AbstractUpdate -{ - - public V13_0_To_V13_1() - { - super( 13.0, 13.1, "Adicionar propriedade processo_motivo_id em trabalhadores." ); - } - - @Override - public void doUpdate() throws Exception - { - SHSTUpdate7 upd7 = new SHSTUpdate7( 13.0, 13.1 ); - upd7.doUpdate(); - } - -} diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V13_1_To_V13_2.java b/trunk/SIPRPSoft/src/siprp/update/updates/V13_1_To_V13_2.java deleted file mode 100644 index eedbecc0..00000000 --- a/trunk/SIPRPSoft/src/siprp/update/updates/V13_1_To_V13_2.java +++ /dev/null @@ -1,33 +0,0 @@ -package siprp.update.updates; - -import com.evolute.module.updater.AbstractUpdate; -import com.evolute.utils.sql.Delete; - -public class V13_1_To_V13_2 extends AbstractUpdate -{ - - public V13_1_To_V13_2() - { - super( 13.1, 13.2, "Corrigir relatorios." ); - } - - @Override - public void doUpdate() throws Exception - { - Delete queryDeleteRiscos = new Delete( - "DELETE FROM hs_relatorio_posto_risco " + - "WHERE hs_relatorio_posto_risco.risco_id IN ( " + - "SELECT hs_relatorio_risco.id FROM hs_relatorio_risco WHERE hs_relatorio_risco.deleted_date IS NOT NULL " + - ")" - ); - getExecuter().executeQuery( queryDeleteRiscos ); - - Delete queryDeleteMedidas = new Delete( - "DELETE FROM hs_relatorio_posto_medida WHERE hs_relatorio_posto_medida.medida_id IN (" + - "SELECT hs_relatorio_medida.id FROM hs_relatorio_medida WHERE hs_relatorio_medida.deleted_date IS NOT NULL" + - ")" - ); - getExecuter().executeQuery( queryDeleteMedidas ); - } - -} diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V13_2_To_V13_3.java b/trunk/SIPRPSoft/src/siprp/update/updates/V13_2_To_V13_3.java deleted file mode 100644 index d1b3d38f..00000000 --- a/trunk/SIPRPSoft/src/siprp/update/updates/V13_2_To_V13_3.java +++ /dev/null @@ -1,21 +0,0 @@ -package siprp.update.updates; - -import com.evolute.module.updater.AbstractUpdate; -import com.evolute.utils.sql.Insert; - -public class V13_2_To_V13_3 extends AbstractUpdate -{ - - public V13_2_To_V13_3() - { - super( 13.2, 13.3, "Adicionar tipo de Lembrete 'Trabalhador'." ); - } - - @Override - public void doUpdate() throws Exception - { - Insert insert = new Insert( "INSERT INTO lembretes_tipos ( codigo, descricao, ordem, activo ) VALUES ( 'TRABALHADOR', 'Trabalhador', 5, 'y' );" ); - getExecuter().executeQuery( insert ); - } - -} diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V13_3_To_V13_4.java b/trunk/SIPRPSoft/src/siprp/update/updates/V13_3_To_V13_4.java deleted file mode 100644 index 131d2f2d..00000000 --- a/trunk/SIPRPSoft/src/siprp/update/updates/V13_3_To_V13_4.java +++ /dev/null @@ -1,33 +0,0 @@ -package siprp.update.updates; - -import com.evolute.module.updater.AbstractUpdate; -import com.evolute.utils.sql.Delete; - -public class V13_3_To_V13_4 extends AbstractUpdate -{ - - public V13_3_To_V13_4() - { - super( 13.3, 13.4, "Corrigir relatorios." ); - } - - @Override - public void doUpdate() throws Exception - { - Delete queryDeleteRiscos = new Delete( - "DELETE FROM hs_relatorio_posto_risco " + - "WHERE hs_relatorio_posto_risco.risco_id IN ( " + - "SELECT hs_relatorio_risco.id FROM hs_relatorio_risco WHERE hs_relatorio_risco.deleted_date IS NOT NULL " + - ")" - ); - getExecuter().executeQuery( queryDeleteRiscos ); - - Delete queryDeleteMedidas = new Delete( - "DELETE FROM hs_relatorio_posto_medida WHERE hs_relatorio_posto_medida.medida_id IN (" + - "SELECT hs_relatorio_medida.id FROM hs_relatorio_medida WHERE hs_relatorio_medida.deleted_date IS NOT NULL" + - ")" - ); - getExecuter().executeQuery( queryDeleteMedidas ); - } - -} diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V13_7_To_V13_8.java b/trunk/SIPRPSoft/src/siprp/update/updates/V13_7_To_V13_8.java deleted file mode 100644 index 1dfe3bb9..00000000 --- a/trunk/SIPRPSoft/src/siprp/update/updates/V13_7_To_V13_8.java +++ /dev/null @@ -1,19 +0,0 @@ -package siprp.update.updates; - -import com.evolute.module.updater.AbstractUpdate; -import com.evolute.utils.sql.Insert; - -public class V13_7_To_V13_8 extends AbstractUpdate -{ - public V13_7_To_V13_8() - { - super( 13.7, 13.8, "Adicionar valor qualitativo : nao valoravel." ); - } - - @Override - public void doUpdate() throws Exception - { - Insert ins = new Insert( "INSERT INTO hs_relatorio_risco_valor_qualitativo ( description ) VALUES ( 'N\u00E3o Valor\u00E1vel' );" ); - getExecuter().executeQuery( ins ); - } -} diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V14_1_To_V14_2.java b/trunk/SIPRPSoft/src/siprp/update/updates/V14_1_To_V14_2.java deleted file mode 100644 index bd0f2ebf..00000000 --- a/trunk/SIPRPSoft/src/siprp/update/updates/V14_1_To_V14_2.java +++ /dev/null @@ -1,52 +0,0 @@ -package siprp.update.updates; - -import com.evolute.module.updater.AbstractUpdate; -import com.evolute.utils.sql.Delete; -import com.evolute.utils.sql.Update; - -public class V14_1_To_V14_2 extends AbstractUpdate -{ - - public V14_1_To_V14_2( ) - { - super( 14.1, 14.2, "Corrigir relatórios." ); - } - - @Override - public void doUpdate() throws Exception - { - Delete queryDeleteRiscos = new Delete( - "DELETE FROM hs_relatorio_posto_risco " + - "WHERE hs_relatorio_posto_risco.risco_id IN ( " + - "SELECT hs_relatorio_risco.id FROM hs_relatorio_risco WHERE hs_relatorio_risco.deleted_date IS NOT NULL " + - ")" - ); - getExecuter().executeQuery( queryDeleteRiscos ); - - Delete queryDeleteMedidas = new Delete( - "DELETE FROM hs_relatorio_posto_medida WHERE hs_relatorio_posto_medida.medida_id IN (" + - "SELECT hs_relatorio_medida.id FROM hs_relatorio_medida WHERE hs_relatorio_medida.deleted_date IS NOT NULL" + - ")" - ); - getExecuter().executeQuery( queryDeleteMedidas ); - - Update updateIndex = new Update( "create index hs_relatorio_posto_medida_medida_idx on hs_relatorio_posto_medida( posto_id );" ); - getExecuter().executeQuery( updateIndex ); - Update updateIndex2 = new Update( "create index hs_relatorio_posto_medida_posto_idx on hs_relatorio_posto_medida( medida_id );" ); - getExecuter().executeQuery( updateIndex2 ); - - Update update = new Update( - "UPDATE hs_relatorio_medida " + - "SET deleted_date = now() " + - "WHERE hs_relatorio_medida.id IN ( " + - "SELECT hs_relatorio_medida.id " + - "FROM hs_relatorio_medida " + - "LEFT OUTER JOIN hs_relatorio_posto_medida ON ( hs_relatorio_medida.id = hs_relatorio_posto_medida.medida_id ) " + - "WHERE " + - "hs_relatorio_posto_medida.medida_id IS null " + - ")" - ); - getExecuter().executeQuery( update ); - } - -} diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V14_2_To_V14_3.java b/trunk/SIPRPSoft/src/siprp/update/updates/V14_2_To_V14_3.java deleted file mode 100644 index ac6617e8..00000000 --- a/trunk/SIPRPSoft/src/siprp/update/updates/V14_2_To_V14_3.java +++ /dev/null @@ -1,26 +0,0 @@ -package siprp.update.updates; - -import static com.evolute.utils.strings.UnicodeLatin1Map.atilde; -import static com.evolute.utils.strings.UnicodeLatin1Map.ccedil; -import static com.evolute.utils.strings.UnicodeLatin1Map.ecirc; -import static com.evolute.utils.strings.UnicodeLatin1Map.oacute; -import shst.data.outer.HsRelatorioNormalizacaoData; - -import com.evolute.module.updater.AbstractUpdate; -import com.evolute.utils.db.PSQLSequenceUtils; - -public class V14_2_To_V14_3 extends AbstractUpdate -{ - - public V14_2_To_V14_3( ) - { - super( 14.2, 14.3, "Correc" + ccedil + atilde + "o de sequ" + ecirc + "ncias na normaliza" + ccedil + atilde + "o (Relat" + oacute + "rios de H&S)" ); - } - - @Override - public void doUpdate() throws Exception - { - PSQLSequenceUtils.fixSequence( HsRelatorioNormalizacaoData.TABLENAME, HsRelatorioNormalizacaoData.ID ); - } - -} diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V6_1_To_V7_0.java b/trunk/SIPRPSoft/src/siprp/update/updates/V6_1_To_V7_0.java deleted file mode 100644 index 0cd34a03..00000000 --- a/trunk/SIPRPSoft/src/siprp/update/updates/V6_1_To_V7_0.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * V6_1_To_V7_0.java - * - * Created on 26 de Setembro de 2006, 11:48 - * - * To change this template, choose Tools | Template Manager - * and open the template in the editor. - */ - -package siprp.update.updates; - -import com.evolute.module.updater.AbstractUpdate; -import com.evolute.utils.db.Executer; - - -/** - * - * @author fpalma - */ -public class V6_1_To_V7_0 extends AbstractUpdate -{ - - public V6_1_To_V7_0() - { - super(6.1,7.0,"Acrescentar campo de contribuinte nos prestadores", - "Acrescentar campo de prestador nas marca\u00e7\u00f5es", - "Acrescentar campo de prestador no hist\u00f3rico das marca\u00e7\u00f5es"); - } - - @Override - public void doUpdate() throws Exception - { - Executer executer = getExecuter(); - com.evolute.utils.sql.Update update = - new com.evolute.utils.sql.Update( "ALTER TABLE prestadores ADD contribuinte VARCHAR(64);" ); - executer.executeQuery( update ); - update = new com.evolute.utils.sql.Update( "ALTER TABLE marcacoes_trabalhador ADD prestador_id int4 REFERENCES prestadores( id );" ); - executer.executeQuery( update ); - update = new com.evolute.utils.sql.Update( "ALTER TABLE marcacoes_trabalhador_estados ADD prestador_id int4 REFERENCES prestadores( id );" ); - executer.executeQuery( update ); - } - -} diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V7_0_To_V7_2.java b/trunk/SIPRPSoft/src/siprp/update/updates/V7_0_To_V7_2.java deleted file mode 100644 index f636627b..00000000 --- a/trunk/SIPRPSoft/src/siprp/update/updates/V7_0_To_V7_2.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * V7_0_To_V7_2.java - * - * Created on 26 de Setembro de 2006, 11:48 - * - * To change this template, choose Tools | Template Manager - * and open the template in the editor. - */ - -package siprp.update.updates; - -import com.evolute.module.updater.AbstractUpdate; -import com.evolute.utils.db.Executer; - - -/** - * - * @author fpalma - */ -public class V7_0_To_V7_2 extends AbstractUpdate -{ - - public V7_0_To_V7_2() - { - super(7.0,7.2,"Criar tabela dos processos"); - } - - @Override - public void doUpdate() throws Exception - { - Executer executer = getExecuter(); - com.evolute.utils.sql.Update update = - new com.evolute.utils.sql.Update( - "CREATE TABLE marcacoes_processo " - + "( " - + "id serial NOT NULL, " - + "trabalhador_id int4 NOT NULL, " - + "estado char(1) NOT NULL DEFAULT 'a'::bpchar, " - + "data_inicio date, " - + "data_fim date, " - + "CONSTRAINT marcacoes_processo_pkey PRIMARY KEY (id), " - + "CONSTRAINT marcacoes_processo_trabalhador_id_fkey FOREIGN KEY (trabalhador_id) " - + "REFERENCES trabalhadores (id) MATCH SIMPLE " - + "ON UPDATE NO ACTION ON DELETE NO ACTION " - + ") " - + "WITHOUT OIDS;" ); - executer.executeQuery( update ); - } - -} diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V7_2_To_V7_4.java b/trunk/SIPRPSoft/src/siprp/update/updates/V7_2_To_V7_4.java deleted file mode 100644 index 56c08183..00000000 --- a/trunk/SIPRPSoft/src/siprp/update/updates/V7_2_To_V7_4.java +++ /dev/null @@ -1,185 +0,0 @@ -/* - * V7_2_To_V7_4.java - * - * Created on 26 de Setembro de 2006, 11:48 - * - * To change this template, choose Tools | Template Manager - * and open the template in the editor. - */ - -package siprp.update.updates; - -import com.evolute.module.updater.AbstractUpdate; -import com.evolute.utils.db.Executer; - - -/** - * - * @author fpalma - */ -public class V7_2_To_V7_4 extends AbstractUpdate -{ - - public V7_2_To_V7_4() - { - super(7.2,7.4,"Acrescentar campo de motivo ao processo", - "Criar tabelas de suporte aos processos"); - } - - public void doUpdate() - throws Exception - { - Executer executer = getExecuter(); - com.evolute.utils.sql.Update update = - new com.evolute.utils.sql.Update( - "ALTER TABLE marcacoes_processo RENAME TO trabalhadores_processo;" ); - executer.executeQuery( update ); - update = - new com.evolute.utils.sql.Update( - "ALTER TABLE trabalhadores_processo ADD motivo int4;" ); - executer.executeQuery( update ); - update = - new com.evolute.utils.sql.Update( - "CREATE TABLE trabalhadores_consultas" - +"(" - +" id serial," - +" trabalhador_id int4 NOT NULL," - +" data date," - +" estado int4," - +" prestador_id int4," - +" processo_id int4," - +" CONSTRAINT trabalhadores_consultas_pkey PRIMARY KEY (id)," - +" CONSTRAINT trabalhadores_consultas_prestador_id_fkey FOREIGN KEY (prestador_id) REFERENCES prestadores (id) ON UPDATE RESTRICT ON DELETE RESTRICT," - +" CONSTRAINT trabalhadores_consultas_processo_id_fkey FOREIGN KEY (processo_id) REFERENCES trabalhadores_processo (id) ON UPDATE RESTRICT ON DELETE RESTRICT," - +" CONSTRAINT trabalhadores_consultas_trabalhador_id_fkey FOREIGN KEY (trabalhador_id) REFERENCES trabalhadores (id) ON UPDATE RESTRICT ON DELETE RESTRICT" - +") " - +"WITHOUT OIDS;" - +"ALTER TABLE trabalhadores_consultas OWNER TO postgres;" ); - executer.executeQuery( update ); - update = - new com.evolute.utils.sql.Update( - "CREATE TABLE trabalhadores_consultas_datas" - +"(" - +" id serial," - +" data date," - +" trabalhadores_consultas_id int4," - +" estado int4," - +" CONSTRAINT trabalhadores_consultas_datas_pkey PRIMARY KEY (id)," - +" CONSTRAINT trabalhadores_consultas_datas_trabalhadores_consultas_id_fkey FOREIGN KEY (trabalhadores_consultas_id) REFERENCES trabalhadores_consultas (id) ON UPDATE RESTRICT ON DELETE RESTRICT" - +") " - +"WITHOUT OIDS;" - +"ALTER TABLE trabalhadores_consultas_datas OWNER TO postgres;" ); - executer.executeQuery( update ); - update = - new com.evolute.utils.sql.Update( - "CREATE TABLE trabalhadores_consultas_datas_emails" - +"(" - +" id serial," - +" trabalhadores_consultas_datas_id int4," - +" destination varchar(512)," - +" data date," - +" subject varchar(512)," - +" body varchar(32768)," - +" CONSTRAINT trabalhadores_consultas_datas_emails_pkey PRIMARY KEY (id)," - +" CONSTRAINT trabalhadores_consultas_data_trabalhadores_consultas_data_fkey1 FOREIGN KEY (trabalhadores_consultas_datas_id) REFERENCES trabalhadores_consultas_datas (id) ON UPDATE RESTRICT ON DELETE RESTRICT" - +") " - +"WITHOUT OIDS;" - +"ALTER TABLE trabalhadores_consultas_datas_emails OWNER TO postgres;" ); - executer.executeQuery( update ); - update = - new com.evolute.utils.sql.Update( - "CREATE TABLE trabalhadores_consultas_datas_observacoes" - +"(" - +" id serial," - +" trabalhadores_consultas_datas_id int4," - +" observacao varchar(4096)," - +" CONSTRAINT trabalhadores_consultas_datas_observacoes_pkey PRIMARY KEY (id)," - +" CONSTRAINT trabalhadores_consultas_datas_trabalhadores_consultas_data_fkey FOREIGN KEY (trabalhadores_consultas_datas_id) REFERENCES trabalhadores_consultas_datas (id) ON UPDATE RESTRICT ON DELETE RESTRICT" - +") " - +"WITHOUT OIDS;" - +"ALTER TABLE trabalhadores_consultas_datas_observacoes OWNER TO postgres;" ); - executer.executeQuery( update ); - update = - new com.evolute.utils.sql.Update( - "CREATE TABLE trabalhadores_ecds" - +"(" - +" id serial," - +" trabalhador_id int4," - +" estado int4," - +" data date," - +" processo_id int4," - +" CONSTRAINT trabalhadores_ecgs_pkey PRIMARY KEY (id)," - +" CONSTRAINT trabalhadores_ecds_processo_id_fkey FOREIGN KEY (processo_id) REFERENCES trabalhadores_processo (id) ON UPDATE RESTRICT ON DELETE RESTRICT," - +" CONSTRAINT trabalhadores_ecgs_trabalhador_id_fkey FOREIGN KEY (trabalhador_id) REFERENCES trabalhadores (id) ON UPDATE RESTRICT ON DELETE RESTRICT" - +") " - +"WITHOUT OIDS;" - +"ALTER TABLE trabalhadores_ecds OWNER TO postgres;" ); - executer.executeQuery( update ); - update = - new com.evolute.utils.sql.Update( - "CREATE TABLE trabalhadores_ecds_datas" - +"(" - +" id serial," - +" trabalhadores_ecds_id int4," - +" data date," - +" estado int4," - +" CONSTRAINT trabalhadores_ecds_datas_pkey PRIMARY KEY (id)," - +" CONSTRAINT trabalhadores_ecds_datas_trabalhadores_ecds_id_fkey FOREIGN KEY (trabalhadores_ecds_id) REFERENCES trabalhadores_ecds (id) ON UPDATE RESTRICT ON DELETE RESTRICT" - +") " - +"WITHOUT OIDS;" - +"ALTER TABLE trabalhadores_ecds_datas OWNER TO postgres;" ); - executer.executeQuery( update ); - update = - new com.evolute.utils.sql.Update( - "CREATE TABLE trabalhadores_ecd" - +"(" - +" id int4 NOT NULL," - +" ecd_id int4," - +" ecd_oficial_id int4," - +" prestador_id int4," - +" estado int4," - +" trabalhadores_ecds_id int4," - +" trabalhadores_ecds_datas_id int4," - +" CONSTRAINT trabalhadores_ecg_pkey PRIMARY KEY (id)," - +" CONSTRAINT trabalhadores_ecd_trabalhadores_ecds_datas_id_fkey FOREIGN KEY (trabalhadores_ecds_datas_id) REFERENCES trabalhadores_ecds_datas (id) ON UPDATE RESTRICT ON DELETE RESTRICT," - +" CONSTRAINT trabalhadores_ecd_trabalhadores_ecds_id_fkey FOREIGN KEY (trabalhadores_ecds_id) REFERENCES trabalhadores_ecds (id) ON UPDATE RESTRICT ON DELETE RESTRICT," - +" CONSTRAINT trabalhadores_ecg_ecd_id_fkey FOREIGN KEY (ecd_id) REFERENCES prt_tipos_elementos_protocolo (id) ON UPDATE RESTRICT ON DELETE RESTRICT," - +" CONSTRAINT trabalhadores_ecg_ecd_oficial_id_fkey FOREIGN KEY (ecd_oficial_id) REFERENCES ecd_oficial (id) ON UPDATE RESTRICT ON DELETE RESTRICT," - +" CONSTRAINT trabalhadores_ecg_prestador_id_fkey FOREIGN KEY (prestador_id) REFERENCES prestadores (id) ON UPDATE RESTRICT ON DELETE RESTRICT" - +") " - +"WITHOUT OIDS;" - +"ALTER TABLE trabalhadores_ecd OWNER TO postgres;" ); - executer.executeQuery( update ); - update = - new com.evolute.utils.sql.Update( - "CREATE TABLE trabalhadores_ecds_datas_emails" - +"(" - +" id serial," - +" trabalhadores_ecds_datas_id int4," - +" destination varchar(512)," - +" data date," - +" subject varchar(512)," - +" body varchar(32768)," - +" CONSTRAINT trabalhadores_ecds_datas_emails_pkey PRIMARY KEY (id)," - +" CONSTRAINT trabalhadores_ecds_datas_email_trabalhadores_ecds_datas_id_fkey FOREIGN KEY (trabalhadores_ecds_datas_id) REFERENCES trabalhadores_ecds_datas (id) ON UPDATE RESTRICT ON DELETE RESTRICT" - +") " - +"WITHOUT OIDS;" - +"ALTER TABLE trabalhadores_ecds_datas_emails OWNER TO postgres;" ); - executer.executeQuery( update ); - update = - new com.evolute.utils.sql.Update( - "CREATE TABLE trabalhadores_ecds_datas_observacoes" - +"(" - +" id serial," - +" trabalhadores_ecds_datas_id int4," - +" observacao varchar(4096)," - +" CONSTRAINT trabalhadores_ecds_datas_observacoes_pkey PRIMARY KEY (id)," - +" CONSTRAINT trabalhadores_ecds_datas_obser_trabalhadores_ecds_datas_id_fkey FOREIGN KEY (trabalhadores_ecds_datas_id) REFERENCES trabalhadores_ecds_datas (id) ON UPDATE RESTRICT ON DELETE RESTRICT" - +") " - +"WITHOUT OIDS;" - +"ALTER TABLE trabalhadores_ecds_datas_observacoes OWNER TO postgres;" ); - executer.executeQuery( update ); - - } - -} diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V7_4_To_V7_5.java b/trunk/SIPRPSoft/src/siprp/update/updates/V7_4_To_V7_5.java deleted file mode 100644 index 8c8370de..00000000 --- a/trunk/SIPRPSoft/src/siprp/update/updates/V7_4_To_V7_5.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * V7_4_To_V7_5.java - * - * Created on 26 de Setembro de 2006, 11:48 - * - * To change this template, choose Tools | Template Manager - * and open the template in the editor. - */ - -package siprp.update.updates; - -import com.evolute.module.updater.AbstractUpdate; -import com.evolute.utils.db.Executer; - - -/** - * - * @author fpalma - */ -public class V7_4_To_V7_5 extends AbstractUpdate -{ - - public V7_4_To_V7_5() - { - super( 7.4,7.5,"Ligar processo a ficha de aptid\u00e3o"); - } - - public void doUpdate() - throws Exception - { - Executer executer = getExecuter(); - com.evolute.utils.sql.Update update = - new com.evolute.utils.sql.Update( - "CREATE TABLE trabalhadores_fichas_aptidao" - +"(" - +" id serial," - +" processo_id int4," - +" exame_id int4," - +" CONSTRAINT trabalhadores_fichas_aptidao_pkey PRIMARY KEY (id)," - +" CONSTRAINT trabalhadores_fichas_aptidao_exame_id_fkey FOREIGN KEY (exame_id) REFERENCES exames (id) ON UPDATE RESTRICT ON DELETE RESTRICT," - +" CONSTRAINT trabalhadores_fichas_aptidao_processo_id_fkey FOREIGN KEY (processo_id) REFERENCES trabalhadores_processo (id) ON UPDATE RESTRICT ON DELETE RESTRICT" - +")" - +"WITHOUT OIDS;" - +"ALTER TABLE trabalhadores_fichas_aptidao OWNER TO postgres;" ); - executer.executeQuery( update ); - } - -} diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V7_5_To_V7_6.java b/trunk/SIPRPSoft/src/siprp/update/updates/V7_5_To_V7_6.java deleted file mode 100644 index 0d46f4ef..00000000 --- a/trunk/SIPRPSoft/src/siprp/update/updates/V7_5_To_V7_6.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * V7_5_To_V7_6.java - * - * Created on 26 de Setembro de 2006, 11:48 - * - * To change this template, choose Tools | Template Manager - * and open the template in the editor. - */ - -package siprp.update.updates; - -import com.evolute.module.updater.AbstractUpdate; -import com.evolute.utils.db.Executer; - - -/** - * - * @author fpalma - */ -public class V7_5_To_V7_6 extends AbstractUpdate -{ - - public V7_5_To_V7_6() - { - super(7.5,7.6,"Alterar tabela dos processos"); - } - - @Override - public void doUpdate() throws Exception - { - Executer executer = getExecuter(); - com.evolute.utils.sql.Update update = - new com.evolute.utils.sql.Update( - "ALTER TABLE trabalhadores_processo ADD sub_motivo int4;" ); - executer.executeQuery( update ); - } - -} diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V7_6_To_V7_7.java b/trunk/SIPRPSoft/src/siprp/update/updates/V7_6_To_V7_7.java deleted file mode 100644 index 41b57180..00000000 --- a/trunk/SIPRPSoft/src/siprp/update/updates/V7_6_To_V7_7.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * V7_6_To_V7_7.java - * - * Created on May 15, 2007, 3:12 PM - * - * To change this template, choose Tools | Template Manager - * and open the template in the editor. - */ - -package siprp.update.updates; - -import com.evolute.module.updater.AbstractUpdate; -import com.evolute.utils.db.Executer; -import com.evolute.utils.sql.Assignment; -import com.evolute.utils.sql.Field; - -/** - * - * @author lflores - */ -public class V7_6_To_V7_7 extends AbstractUpdate -{ - - public V7_6_To_V7_7() - { - super(7.6,7.7,"Alterar tabela dos exames e criar tabela exames_portaria"); - } - - @Override - public void doUpdate() throws Exception - { - Executer executer = getExecuter(); - com.evolute.utils.sql.Update update = - new com.evolute.utils.sql.Update( - "ALTER TABLE exames ADD fo BYTEA;" ); - executer.executeQuery( update ); - update = new com.evolute.utils.sql.Update( - "CREATE TABLE exames_portaria ( id SERIAL NOT NULL, portaria VARCHAR(255) NOT NULL, " - + "data_entrada timestamp without time zone NOT NULL DEFAULT now(), PRIMARY KEY( id ) );" ); - executer.executeQuery( update ); - com.evolute.utils.sql.Insert insert = - new com.evolute.utils.sql.Insert( "exames_portaria", - new Assignment[]{ new Assignment( new Field( "portaria" ), "Portaria n. 299/2007, de 16 de Mar\u00e7o" ) } ); - executer.executeQuery( insert ); - } - -} diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V7_7_To_V7_8.java b/trunk/SIPRPSoft/src/siprp/update/updates/V7_7_To_V7_8.java deleted file mode 100644 index 1f8c2c06..00000000 --- a/trunk/SIPRPSoft/src/siprp/update/updates/V7_7_To_V7_8.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * V7_7_To_V7_8.java - * - * Created on May 15, 2007, 3:12 PM - * - * To change this template, choose Tools | Template Manager - * and open the template in the editor. - */ - -package siprp.update.updates; - -import com.evolute.module.updater.AbstractUpdate; -import com.evolute.utils.db.Executer; - -/** - * - * @author lflores - */ -public class V7_7_To_V7_8 extends AbstractUpdate -{ - - public V7_7_To_V7_8() - { - super(7.7,7.8,"Alterar tabela das datas de exames para incluir o prestador", - "Alterar tabela das datas de consulta para incluir o prestador"); - } - - public void doUpdate() throws Exception - { - Executer executer = getExecuter(); - com.evolute.utils.sql.Update update = - new com.evolute.utils.sql.Update( - "ALTER TABLE trabalhadores_ecds_datas ADD prestador_id INTEGER REFERENCES prestadores( id );" ); - executer.executeQuery( update ); - update = new com.evolute.utils.sql.Update( - "ALTER TABLE trabalhadores_consultas_datas ADD prestador_id INTEGER REFERENCES prestadores( id );" ); - executer.executeQuery( update ); - - } - -} diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V7_8_To_V7_9.java b/trunk/SIPRPSoft/src/siprp/update/updates/V7_8_To_V7_9.java deleted file mode 100644 index 938f1946..00000000 --- a/trunk/SIPRPSoft/src/siprp/update/updates/V7_8_To_V7_9.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * V7_8_To_V7_9.java - * - * Created on December 19, 2007, 3:12 PM - * - * To change this template, choose Tools | Template Manager - * and open the template in the editor. - */ - -package siprp.update.updates; - -import com.evolute.module.updater.AbstractUpdate; -import com.evolute.utils.db.Executer; - -/** - * - * @author fpalma - */ -public class V7_8_To_V7_9 extends AbstractUpdate -{ - - public V7_8_To_V7_9() - { - super(7.8,7.9,"Alterar tabela dos estabelecimentos para ter prestadores por defeito"); - } - - @Override - public void doUpdate() throws Exception - { - Executer executer = getExecuter(); - com.evolute.utils.sql.Update update = - new com.evolute.utils.sql.Update( - "ALTER TABLE estabelecimentos ADD prestador_consulta_id INTEGER REFERENCES prestadores( id );" ); - executer.executeQuery( update ); - update = - new com.evolute.utils.sql.Update( - "ALTER TABLE estabelecimentos ADD prestador_ecds_id INTEGER REFERENCES prestadores( id );" ); - executer.executeQuery( update ); - update = - new com.evolute.utils.sql.Update( - "ALTER TABLE estabelecimentos ADD aux INT REFERENCES contactos(id);" ); - executer.executeQuery( update ); - update = - new com.evolute.utils.sql.Update( - "UPDATE estabelecimentos SET aux = CAST( contacto AS INTEGER);" ); - executer.executeQuery( update ); - update = - new com.evolute.utils.sql.Update( - "ALTER TABLE estabelecimentos RENAME contacto TO contacto_backup;" ); - executer.executeQuery( update ); - update = - new com.evolute.utils.sql.Update( - "ALTER TABLE estabelecimentos RENAME aux TO contacto_id;" ); - executer.executeQuery( update ); - } - -} diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V7_9_To_V8_0.java b/trunk/SIPRPSoft/src/siprp/update/updates/V7_9_To_V8_0.java deleted file mode 100644 index c10af2a9..00000000 --- a/trunk/SIPRPSoft/src/siprp/update/updates/V7_9_To_V8_0.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * V7_9_To_V8_0.java - * - * Created on December 19, 2007, 3:12 PM - * - * To change this template, choose Tools | Template Manager - * and open the template in the editor. - */ - -package siprp.update.updates; - -import com.evolute.module.updater.AbstractUpdate; -import com.evolute.utils.db.Executer; - -/** - * - * @author fpalma - */ -public class V7_9_To_V8_0 extends AbstractUpdate -{ - - public V7_9_To_V8_0() - { - super(7.9,8.0,"Alterar tabela dos ecds"); - } - - @Override - public void doUpdate() throws Exception - { - Executer executer = getExecuter(); - com.evolute.utils.sql.Update update = - new com.evolute.utils.sql.Update( - "ALTER TABLE trabalhadores_ecd DROP CONSTRAINT trabalhadores_ecd_trabalhadores_ecds_id_fkey;" ); - executer.executeQuery( update ); - update = - new com.evolute.utils.sql.Update( - "ALTER TABLE trabalhadores_ecd DROP trabalhadores_ecds_id;" ); - executer.executeQuery( update ); - update = - new com.evolute.utils.sql.Update( - "ALTER TABLE trabalhadores_ecd DROP CONSTRAINT trabalhadores_ecg_prestador_id_fkey;" ); - executer.executeQuery( update ); - update = - new com.evolute.utils.sql.Update( - "ALTER TABLE trabalhadores_ecd DROP prestador_id;" ); - executer.executeQuery( update ); - } - -} diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V8_0_To_V8_1.java b/trunk/SIPRPSoft/src/siprp/update/updates/V8_0_To_V8_1.java deleted file mode 100644 index 1cd5ae0f..00000000 --- a/trunk/SIPRPSoft/src/siprp/update/updates/V8_0_To_V8_1.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * V8_0_To_V8_1.java - * - * Created on December 19, 2007, 3:12 PM - * - * To change this template, choose Tools | Template Manager - * and open the template in the editor. - */ - -package siprp.update.updates; - -import com.evolute.module.updater.AbstractUpdate; - -/** - * - * @author fpalma - */ -public class V8_0_To_V8_1 extends AbstractUpdate -{ - - public V8_0_To_V8_1() - { - super(8.0,8.1,"Alterar tabela dos ecds"); - } - - @Override - public void doUpdate() throws Exception - { - com.evolute.utils.sql.Update update = - new com.evolute.utils.sql.Update( - "CREATE SEQUENCE trabalhadores_ecd_id_seq;" ); - getExecuter().executeQuery( update ); - update = - new com.evolute.utils.sql.Update( - "ALTER TABLE trabalhadores_ecd ALTER COLUMN id SET DEFAULT NEXTVAL('trabalhadores_ecd_id_seq');" ); - getExecuter().executeQuery( update ); - } - -} diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V8_1_To_V8_2.java b/trunk/SIPRPSoft/src/siprp/update/updates/V8_1_To_V8_2.java deleted file mode 100644 index bc70145b..00000000 --- a/trunk/SIPRPSoft/src/siprp/update/updates/V8_1_To_V8_2.java +++ /dev/null @@ -1,72 +0,0 @@ -/* - * V8_1_To_V8_2.java - * - * Created on December 19, 2007, 3:12 PM - * - * To change this template, choose Tools | Template Manager - * and open the template in the editor. - */ - -package siprp.update.updates; - -import com.evolute.module.updater.AbstractUpdate; -import com.evolute.utils.db.Executer; -import com.evolute.utils.sql.Delete; - -/** - * - * @author fpalma - */ -public class V8_1_To_V8_2 extends AbstractUpdate -{ - - public V8_1_To_V8_2() - { - super(8.1,8.2,"Alterar tabela dos ecds", "Alterar tabela de marca\u00e7\u00e3o dos ecds"); - } - - @Override - public void doUpdate() throws Exception - { - Executer executer = getExecuter(); - com.evolute.utils.sql.Update update = - new com.evolute.utils.sql.Update( - "ALTER TABLE trabalhadores_ecd ADD enviado CHAR(1);" ); - executer.executeQuery( update ); - update = - new com.evolute.utils.sql.Update( - "ALTER TABLE trabalhadores_ecds_datas ADD analisador_id INT REFERENCES prestadores( id );" ); - executer.executeQuery( update ); - update = - new com.evolute.utils.sql.Update( - "ALTER TABLE trabalhadores_ecds_datas ADD data_envio DATE;" ); - executer.executeQuery( update ); - update = - new com.evolute.utils.sql.Update( - "ALTER TABLE trabalhadores_ecds_datas ADD data_recepcao DATE;" ); - executer.executeQuery( update ); - Delete delete = new Delete( "trabalhadores_ecd", null ); - executer.executeQuery( delete ); - delete = new Delete( "trabalhadores_ecds_datas_emails", null ); - executer.executeQuery( delete ); - delete = new Delete( "trabalhadores_ecds_datas_observacoes", null ); - executer.executeQuery( delete ); - delete = new Delete( "trabalhadores_ecds_datas", null ); - executer.executeQuery( delete ); - delete = new Delete( "trabalhadores_ecds", null ); - executer.executeQuery( delete ); - delete = new Delete( "trabalhadores_consultas_datas_emails", null ); - executer.executeQuery( delete ); - delete = new Delete( "trabalhadores_consultas_datas_observacoes", null ); - executer.executeQuery( delete ); - delete = new Delete( "trabalhadores_consultas_datas", null ); - executer.executeQuery( delete ); - delete = new Delete( "trabalhadores_consultas", null ); - executer.executeQuery( delete ); - delete = new Delete( "trabalhadores_fichas_aptidao", null ); - executer.executeQuery( delete ); - delete = new Delete( "trabalhadores_processo", null ); - executer.executeQuery( delete ); - } - -} diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V8_2_To_V8_3.java b/trunk/SIPRPSoft/src/siprp/update/updates/V8_2_To_V8_3.java deleted file mode 100644 index 10534d55..00000000 --- a/trunk/SIPRPSoft/src/siprp/update/updates/V8_2_To_V8_3.java +++ /dev/null @@ -1,41 +0,0 @@ -package siprp.update.updates; - -import com.evolute.module.updater.AbstractUpdate; - -/** - * - * @author fpalma - */ -public class V8_2_To_V8_3 extends AbstractUpdate -{ - - public V8_2_To_V8_3() - { - super(8.2,8.3,"Criar tabela para locais de an\u00e1lise"); - } - - @Override - public void doUpdate() throws Exception - { - com.evolute.utils.sql.Update update = - new com.evolute.utils.sql.Update( - "CREATE TABLE trabalhadores_ecds_analise" - + "(" - + "id serial, " - + "data date NOT NULL, " - + "prestador_id int4 NOT NULL, " - + "grupo_ecds_id int4 NOT NULL, " - + "CONSTRAINT trabalhadores_ecds_analise_pkey PRIMARY KEY (id), " - + "CONSTRAINT trabalhadores_ecds_analise_grupo_ecds_id_fkey FOREIGN KEY (grupo_ecds_id) " - + " REFERENCES prt_grupos_protocolo (id) MATCH SIMPLE " - + " ON UPDATE NO ACTION ON DELETE NO ACTION, " - + "CONSTRAINT trabalhadores_ecds_analise_prestador_id_fkey FOREIGN KEY (prestador_id) " - + " REFERENCES prestadores (id) MATCH SIMPLE " - + " ON UPDATE NO ACTION ON DELETE NO ACTION " - + ") " - + "WITHOUT OIDS; " - + "ALTER TABLE trabalhadores_ecds_analise OWNER TO postgres;" ); - getExecuter().executeQuery( update ); - } - -} diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V8_3_To_V8_4.java b/trunk/SIPRPSoft/src/siprp/update/updates/V8_3_To_V8_4.java deleted file mode 100644 index 7563bdf3..00000000 --- a/trunk/SIPRPSoft/src/siprp/update/updates/V8_3_To_V8_4.java +++ /dev/null @@ -1,24 +0,0 @@ -package siprp.update.updates; - -import com.evolute.module.updater.AbstractUpdate; - -/** - * - * @author tsimao - * - */ -public class V8_3_To_V8_4 extends AbstractUpdate -{ - public V8_3_To_V8_4() - { - super(8.3,8.4,"Adicionado analisador [prestador] por TrabalhadorEcd"); - } - - @Override - public void doUpdate() throws Exception - { - com.evolute.utils.sql.Update update = new com.evolute.utils.sql.Update( "ALTER TABLE trabalhadores_ecd ADD COLUMN analisador_id int4;" + "ALTER TABLE trabalhadores_ecd ADD CONSTRAINT analisador_id_fkey FOREIGN KEY(analisador_id) REFERENCES prestadores(id);" ); - getExecuter().executeQuery( update ); - } - -} diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V8_4_To_V8_5.java b/trunk/SIPRPSoft/src/siprp/update/updates/V8_4_To_V8_5.java deleted file mode 100644 index 6d2e542b..00000000 --- a/trunk/SIPRPSoft/src/siprp/update/updates/V8_4_To_V8_5.java +++ /dev/null @@ -1,25 +0,0 @@ -package siprp.update.updates; - -import com.evolute.module.updater.AbstractUpdate; - -/** - * - * @author tsimao - * - */ -public class V8_4_To_V8_5 extends AbstractUpdate -{ - public V8_4_To_V8_5() - { - super(8.4,8.5,"Adicionado analisador [prestador] por PrtGruposProtocolo"); - } - - @Override - public void doUpdate() throws Exception - { - com.evolute.utils.sql.Update update = new com.evolute.utils.sql.Update( "ALTER TABLE prt_grupos_protocolo ADD COLUMN analisador_id int4;" - + "ALTER TABLE prt_grupos_protocolo ADD CONSTRAINT analisador_id_fkey FOREIGN KEY(analisador_id) REFERENCES prestadores(id);" ); - getExecuter().executeQuery( update ); - } - -} diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V8_5_To_V8_6.java b/trunk/SIPRPSoft/src/siprp/update/updates/V8_5_To_V8_6.java deleted file mode 100644 index 4a9a098b..00000000 --- a/trunk/SIPRPSoft/src/siprp/update/updates/V8_5_To_V8_6.java +++ /dev/null @@ -1,28 +0,0 @@ -package siprp.update.updates; - -import com.evolute.module.updater.AbstractUpdate; - -/** - * - * @author tsimao - * - */ -public class V8_5_To_V8_6 extends AbstractUpdate -{ - public V8_5_To_V8_6() - { - super(8.5,8.6,"Adicionado campo 'activo' a TrabalhadoresProcesso\n"+ - "Adicionada observacao a Prestadores\n"+ - "Adicionado BI a Trabalhadores\n"); - } - - @Override - public void doUpdate() throws Exception - { - com.evolute.utils.sql.Update update = new com.evolute.utils.sql.Update( "ALTER TABLE trabalhadores_processo ADD COLUMN activo char default 'y';" - + "ALTER TABLE prestadores ADD COLUMN observacoes character varying(65535);" - + "ALTER TABLE trabalhadores ADD COLUMN bi character varying(255);"); - getExecuter().executeQuery( update ); - } - -} diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V8_6_To_V8_7.java b/trunk/SIPRPSoft/src/siprp/update/updates/V8_6_To_V8_7.java deleted file mode 100644 index 4c252f76..00000000 --- a/trunk/SIPRPSoft/src/siprp/update/updates/V8_6_To_V8_7.java +++ /dev/null @@ -1,30 +0,0 @@ -package siprp.update.updates; - -import com.evolute.module.updater.AbstractUpdate; - -/** - * - * @author fpalma - */ -public class V8_6_To_V8_7 extends AbstractUpdate -{ - - public V8_6_To_V8_7() - { - super(8.6,8.7,"Adicionados campos data_envio e data_recepcao a cada instancia de ECD"); - } - - @Override - public void doUpdate() throws Exception - { - com.evolute.utils.sql.Update update = - new com.evolute.utils.sql.Update( - "ALTER TABLE trabalhadores_ecd ADD data_envio DATE;" ); - getExecuter().executeQuery( update ); - update = - new com.evolute.utils.sql.Update( - "ALTER TABLE trabalhadores_ecd ADD data_recepcao DATE;" ); - getExecuter().executeQuery( update ); - } - -} diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V8_7_To_V8_8.java b/trunk/SIPRPSoft/src/siprp/update/updates/V8_7_To_V8_8.java deleted file mode 100644 index 9eaf5b2b..00000000 --- a/trunk/SIPRPSoft/src/siprp/update/updates/V8_7_To_V8_8.java +++ /dev/null @@ -1,30 +0,0 @@ -package siprp.update.updates; - -import com.evolute.module.updater.AbstractUpdate; - -/** - * - * @author fpalma - */ -public class V8_7_To_V8_8 extends AbstractUpdate -{ - - public V8_7_To_V8_8() - { - super(8.7,8.8,"Adicionada coluna em 'lembretes' que referencia nova tabela das marcacoes (trabalhadores_consultas_datas)"); - } - - @Override - public void doUpdate() throws Exception - { - com.evolute.utils.sql.Update update = - new com.evolute.utils.sql.Update( - "ALTER TABLE lembretes ADD COLUMN trabalhadores_consultas_datas_id int4 REFERENCES trabalhadores_consultas_datas(id);" ); - getExecuter().executeQuery( update ); - update = - new com.evolute.utils.sql.Update( - "ALTER TABLE lembretes ADD COLUMN trabalhadores_ecds_datas_id int4 REFERENCES trabalhadores_ecds_datas(id);" ); - getExecuter().executeQuery( update ); - } - -} diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V8_8_To_V8_9.java b/trunk/SIPRPSoft/src/siprp/update/updates/V8_8_To_V8_9.java deleted file mode 100644 index 2863db86..00000000 --- a/trunk/SIPRPSoft/src/siprp/update/updates/V8_8_To_V8_9.java +++ /dev/null @@ -1,26 +0,0 @@ -package siprp.update.updates; - -import com.evolute.module.updater.AbstractUpdate; - -/** - * - * @author fpalma - */ -public class V8_8_To_V8_9 extends AbstractUpdate -{ - - public V8_8_To_V8_9() - { - super(8.8,8.9,"Adicionada coluna em 'lembretes' para marcar lembretes já tratados"); - } - - @Override - public void doUpdate() throws Exception - { - com.evolute.utils.sql.Update update = - new com.evolute.utils.sql.Update( - "alter table lembretes add column deleted_date timestamp;" ); - getExecuter().executeQuery( update ); - } - -} diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V8_9_To_V9_0.java b/trunk/SIPRPSoft/src/siprp/update/updates/V8_9_To_V9_0.java deleted file mode 100644 index 8b299e4e..00000000 --- a/trunk/SIPRPSoft/src/siprp/update/updates/V8_9_To_V9_0.java +++ /dev/null @@ -1,79 +0,0 @@ -package siprp.update.updates; - -import com.evolute.module.updater.AbstractUpdate; - -/** - * - * @author fpalma - */ -public class V8_9_To_V9_0 extends AbstractUpdate -{ - - public V8_9_To_V9_0() - { - super(8.9,9.0, "Criar tabela 'posto_de_trabalho'", - "Criar tabela 'legislacao'", - "Criar tabela relacional 'posto_de_trabalho_estabelecimento'", - "Criar tabela relacional 'legislacao_estabelecimento'", - "Criar tabela 'medida'", - "Criar tabela 'risco'", - "Criar tabela 'medida'", - "Criar tabela relacional 'risco_medida'", - "Criar tabela 'image'", - "Adicionar logotipo a empresa"); - } - - @Override - public void doUpdate() throws Exception - { - com.evolute.utils.sql.Update update = - new com.evolute.utils.sql.Update( - "create table email_plano_de_actuacao(" + - "id serial PRIMARY KEY," + - "description varchar(255) NOT NULL," + - "estabelecimento_id int4 REFERENCES estabelecimentos(id)" + - ");" + - "create table posto_de_trabalho(" + - "id serial PRIMARY KEY," + - "description varchar(1024) NOT NULL" + - ");" + - "create table legislacao(" + - "id serial PRIMARY KEY," + - "parent_id int4 REFERENCES legislacao(id)," + - "description varchar(8192) NOT NULL" + - ");" + - "create table posto_de_trabalho_estabelecimento(" + - "posto_de_trabalho_id int4 REFERENCES posto_de_trabalho(id) NOT NULL," + - "estabelecimento_id int4 REFERENCES estabelecimentos(id) NOT NULL," + - "CONSTRAINT posto_de_trabalho_estabelecimento_pkey PRIMARY KEY(posto_de_trabalho_id, estabelecimento_id)" + - ");" + - "create table legislacao_estabelecimento(" + - "legislacao_id int4 REFERENCES legislacao(id) NOT NULL," + - "estabelecimento_id int4 REFERENCES estabelecimentos(id) NOT NULL," + - "CONSTRAINT legislacao_estabelecimento_pkey PRIMARY KEY(legislacao_id, estabelecimento_id)" + - ");" + - "create table risco(" + - "id serial PRIMARY KEY," + - "description varchar(255) NOT NULL," + - "value int4 NOT NULL" + - ");" + - "create table medida(" + - "id serial PRIMARY KEY," + - "description varchar(255) NOT NULL" + - ");" + - "create table risco_medida(" + - "risco_id int4 REFERENCES risco(id) NOT NULL," + - "medida_id int4 REFERENCES medida(id) NOT NULL," + - "CONSTRAINT risco_medida_pkey PRIMARY KEY(risco_id, medida_id)" + - ");" + - "create table image(" + - "id serial PRIMARY KEY," + - "name varchar(255) NOT NULL," + - "image_data bytea NOT NULL" + - ");" + - "alter table empresas add column empresa_logo_id int4 REFERENCES image(id);" - ); - getExecuter().executeQuery( update ); - } - -} diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V9_0_To_V9_1.java b/trunk/SIPRPSoft/src/siprp/update/updates/V9_0_To_V9_1.java deleted file mode 100644 index d800c233..00000000 --- a/trunk/SIPRPSoft/src/siprp/update/updates/V9_0_To_V9_1.java +++ /dev/null @@ -1,114 +0,0 @@ -package siprp.update.updates; - -import com.evolute.module.updater.AbstractUpdate; - -/** - * - * @author fpalma - */ -public class V9_0_To_V9_1 extends AbstractUpdate -{ - - public V9_0_To_V9_1() - { - super(9.0,9.1,"Refactorizar tabelas de higiene e seguranca","Criar novas tabelas de higiene e seguranca"); - } - - @Override - public void doUpdate() throws Exception - { - com.evolute.utils.sql.Update update = - new com.evolute.utils.sql.Update( - "drop table risco_medida;" + - "drop table risco;" + - "drop table medida;" + - "drop table legislacao_estabelecimento;" + - "drop table legislacao;" + - "drop table posto_de_trabalho_estabelecimento;" + - "drop table posto_de_trabalho;" + - "CREATE TABLE hs_area(" + - " id serial PRIMARY KEY," + - " empresa_id int4 REFERENCES empresas(id)," + - " description varchar(256) NOT NULL" + - ");" + - "CREATE TABLE hs_posto(" + - " id serial PRIMARY KEY," + - " area_id int4 REFERENCES hs_area(id)," + - " description varchar(256) NOT NULL" + - ");" + - "CREATE TABLE hs_medida(" + - " id serial PRIMARY KEY," + - " description varchar(1024) NOT NULL," + - " requesitos_legais varchar(1024)" + - ");" + - "CREATE TABLE hs_risco_tema(" + - " id serial PRIMARY KEY," + - " description varchar(256) NOT NULL" + - ");" + - "CREATE TABLE hs_risco(" + - " id serial PRIMARY KEY," + - " tema_id int4 REFERENCES hs_risco_tema(id)," + - " description varchar(256) NOT NULL" + - ");" + - "CREATE TABLE hs_risco_medida(" + - " risco_id int4 REFERENCES hs_risco(id)," + - " medida_id int4 REFERENCES hs_medida(id)," + - " CONSTRAINT hs_risco_medida_pkey PRIMARY KEY(risco_id, medida_id)" + - ");" + - "create table hs_relatorio(" + - " id serial PRIMARY KEY," + - " data date NOT NULL," + - " deleted_date timestamp" + - ");" + - "create table hs_medida_classificacao(" + - " id serial PRIMARY KEY," + - " description varchar(255) NOT NULL" + - ");" + - "create table hs_relatorio_risco(" + - " id serial PRIMARY KEY," + - " relatorio_id int4 REFERENCES hs_relatorio NOT NULL," + - " description varchar(255) NOT NULL" + - ");" + - "create table hs_relatorio_medida(" + - " id serial PRIMARY KEY," + - " risco_id int4 REFERENCES hs_relatorio_risco NOT NULL," + - " description varchar(1024) NOT NULL," + - " requesitos_legais varchar(1024) NOT NULL," + - " severidade int4," + - " probabilidade int4," + - " classificacao_id int4 REFERENCES hs_medida_classificacao" + - ");" + - "create table hs_normalizacao(" + - " id serial PRIMARY KEY," + - " codigo varchar(128) NOT NULL," + - " descricao varchar(1024) NOT NULL," + - " portuguesa boolean NOT NULL" + - ");" + - "create table hs_equipamento_medico(" + - " id serial PRIMARY KEY," + - " nome varchar(255) NOT NULL" + - ");" + - "create table hs_legislacao_categoria(" + - " id serial PRIMARY KEY," + - " description varchar(255) NOT NULL" + - ");" + - "create table hs_legislacao(" + - " id serial PRIMARY KEY," + - " description varchar(1024) NOT NULL," + - " categoria_id int4 REFERENCES hs_legislacao_categoria(id)" + - ");" + - "create table hs_legislacao_empresa(" + - " legislacao_id int4 REFERENCES hs_legislacao(id)," + - " empresa_id int4 REFERENCES empresas(id)," + - " CONSTRAINT hs_legislacao_empresa_pkey PRIMARY KEY(legislacao_id, empresa_id)" + - ");" + - "create table hs_legislacao_estabelecimento(" + - " legislacao_id int4 REFERENCES hs_legislacao(id)," + - " estabelecimento_id int4 REFERENCES estabelecimentos(id)," + - " CONSTRAINT hs_legislacao_estabelecimento_pkey PRIMARY KEY(legislacao_id, estabelecimento_id)" + - ");" - ); - getExecuter().executeQuery( update ); - } - -} diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V9_1_To_V9_2.java b/trunk/SIPRPSoft/src/siprp/update/updates/V9_1_To_V9_2.java deleted file mode 100644 index 77ddef5f..00000000 --- a/trunk/SIPRPSoft/src/siprp/update/updates/V9_1_To_V9_2.java +++ /dev/null @@ -1,37 +0,0 @@ -package siprp.update.updates; - -import com.evolute.module.updater.AbstractUpdate; - -/** - * - * @author fpalma - */ -public class V9_1_To_V9_2 extends AbstractUpdate -{ - - public V9_1_To_V9_2() - { - super(9.1,9.2,"Soft-delete nas tabelas de higiene e saude"); - } - - @Override - public void doUpdate() throws Exception - { - com.evolute.utils.sql.Update update = - new com.evolute.utils.sql.Update( - "alter table hs_area add column deleted_date timestamp;" + - "alter table hs_equipamento_medico add column deleted_date timestamp;" + - "alter table hs_legislacao add column deleted_date timestamp;" + - "alter table hs_legislacao_categoria add column deleted_date timestamp;" + - "alter table hs_medida add column deleted_date timestamp;" + - "alter table hs_normalizacao add column deleted_date timestamp;" + - "alter table hs_posto add column deleted_date timestamp;" + - "alter table hs_relatorio_medida add column deleted_date timestamp;" + - "alter table hs_relatorio_risco add column deleted_date timestamp;" + - "alter table hs_risco add column deleted_date timestamp;" + - "alter table hs_risco_tema add column deleted_date timestamp;" - ); - getExecuter().executeQuery( update ); - } - -} diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V9_2_To_V9_3.java b/trunk/SIPRPSoft/src/siprp/update/updates/V9_2_To_V9_3.java deleted file mode 100644 index b88d5760..00000000 --- a/trunk/SIPRPSoft/src/siprp/update/updates/V9_2_To_V9_3.java +++ /dev/null @@ -1,41 +0,0 @@ -package siprp.update.updates; - -import com.evolute.module.updater.AbstractUpdate; - -/** - * - * @author fpalma - */ -public class V9_2_To_V9_3 extends AbstractUpdate -{ - - public V9_2_To_V9_3() - { - super(9.2,9.3,"Adicionados campos ao relatorio"); - } - - @Override - public void doUpdate() throws Exception - { - com.evolute.utils.sql.Update update = - new com.evolute.utils.sql.Update( - "alter table hs_relatorio_medida drop column severidade;" + - "alter table hs_relatorio_medida drop column probabilidade;" + - "alter table hs_relatorio_medida drop column classificacao_id;" + - "drop table hs_medida_classificacao;" + - "alter table hs_relatorio add column marcacao_id int4 REFERENCES marcacoes_estabelecimento;" + - "alter table hs_relatorio add column is_submetido timestamp;" + - "alter table hs_relatorio_risco add column probabilidade int4;" + - "alter table hs_relatorio_risco add column severidade int4;" + - "create table hs_relatorio_risco_valor_qualitativo" + - "(" + - " id serial PRIMARY KEY," + - " description varchar(64)" + - ");" + - "alter table hs_relatorio_risco add column valor_qualitativo_id int4 REFERENCES hs_relatorio_risco_valor_qualitativo;" + - "alter table hs_relatorio_risco add column is_plano_actuacao char(1);" - ); - getExecuter().executeQuery( update ); - } - -} diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V9_3_To_V9_4.java b/trunk/SIPRPSoft/src/siprp/update/updates/V9_3_To_V9_4.java deleted file mode 100644 index 7226bb77..00000000 --- a/trunk/SIPRPSoft/src/siprp/update/updates/V9_3_To_V9_4.java +++ /dev/null @@ -1,37 +0,0 @@ -package siprp.update.updates; - -import com.evolute.module.updater.AbstractUpdate; - -/** - * - * @author fpalma - */ -public class V9_3_To_V9_4 extends AbstractUpdate -{ - - public V9_3_To_V9_4() - { - super(9.3,9.4,"Adicionados postos de trabalho relatorio"); - } - - @Override - public void doUpdate() throws Exception - { - com.evolute.utils.sql.Update update = - new com.evolute.utils.sql.Update( - "create table hs_relatorio_medida_area" + - "(" + - " id serial PRIMARY KEY," + - " description varchar(256) NOT NULL" + - ");" + - "create table hs_relatorio_medida_posto" + - "(" + - " id serial PRIMARY KEY," + - " description varchar(256) NOT NULL," + - " area_id int4 REFERENCES hs_relatorio_medida_area(id)" + - ");" - ); - getExecuter().executeQuery( update ); - } - -} diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V9_4_To_V9_5.java b/trunk/SIPRPSoft/src/siprp/update/updates/V9_4_To_V9_5.java deleted file mode 100644 index 26646bdc..00000000 --- a/trunk/SIPRPSoft/src/siprp/update/updates/V9_4_To_V9_5.java +++ /dev/null @@ -1,54 +0,0 @@ -package siprp.update.updates; - -import com.evolute.module.updater.AbstractUpdate; - -/** - * - * @author fpalma - */ -public class V9_4_To_V9_5 extends AbstractUpdate -{ - - public V9_4_To_V9_5() - { - super(9.4,9.5,"Refactorizacao do relatorio"); - } - - public void doUpdate() throws Exception - { - com.evolute.utils.sql.Update update = - new com.evolute.utils.sql.Update( - "drop table hs_relatorio_medida_posto;" + - "drop table hs_relatorio_medida_area;" + - "alter table hs_relatorio_risco drop column probabilidade;" + - "alter table hs_relatorio_risco drop column severidade;" + - "alter table hs_relatorio_risco drop column valor_qualitativo_id;" + - "create table hs_posto_risco(" + - " posto_id int4 REFERENCES hs_posto(id)," + - " risco_id int4 REFERENCES hs_risco(id)," + - " CONSTRAINT hs_posto_risco_pkey PRIMARY KEY (posto_id,risco_id)" + - ");" + - "create table hs_relatorio_area(" + - " id serial PRIMARY KEY," + - " description varchar(256) NOT NULL," + - " deleted_date timestamp" + - ");" + - "create table hs_relatorio_posto(" + - " id serial PRIMARY KEY," + - " description varchar(256) NOT NULL," + - " area_id int4 REFERENCES hs_relatorio_area(id)," + - " deleted_date timestamp" + - ");" + - "create table hs_relatorio_posto_risco(" + - " posto_id int4 REFERENCES hs_relatorio_posto(id)," + - " risco_id int4 REFERENCES hs_relatorio_risco(id)," + - " probabilidade int4," + - " severidade int4," + - " valor_qualitativo_id int4 REFERENCES hs_relatorio_risco_valor_qualitativo(id)," + - " CONSTRAINT hs_relatorio_posto_risco_pkey PRIMARY KEY (posto_id,risco_id)" + - ");" - ); - getExecuter().executeQuery( update ); - } - -} diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V9_5_To_V9_6.java b/trunk/SIPRPSoft/src/siprp/update/updates/V9_5_To_V9_6.java deleted file mode 100644 index bc25d4ac..00000000 --- a/trunk/SIPRPSoft/src/siprp/update/updates/V9_5_To_V9_6.java +++ /dev/null @@ -1,31 +0,0 @@ -package siprp.update.updates; - -import com.evolute.module.updater.AbstractUpdate; - -/** - * - * @author fpalma - */ -public class V9_5_To_V9_6 extends AbstractUpdate -{ - - public V9_5_To_V9_6() - { - super(9.5,9.6,"Relacao postoDeTrabalho <-> estabelecimento"); - } - - @Override - public void doUpdate() throws Exception - { - com.evolute.utils.sql.Update update = - new com.evolute.utils.sql.Update( - "create table hs_posto_estabelecimento(" + - " posto_id int4 REFERENCES hs_posto(id)," + - " estabelecimento_id int4 REFERENCES estabelecimentos(id)," + - " CONSTRAINT hs_posto_estabelecimento_pkey PRIMARY KEY(posto_id,estabelecimento_id)" + - ");" - ); - getExecuter().executeQuery( update ); - } - -} diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V9_6_To_V9_7.java b/trunk/SIPRPSoft/src/siprp/update/updates/V9_6_To_V9_7.java deleted file mode 100644 index a9c66d17..00000000 --- a/trunk/SIPRPSoft/src/siprp/update/updates/V9_6_To_V9_7.java +++ /dev/null @@ -1,40 +0,0 @@ -package siprp.update.updates; - -import com.evolute.module.updater.AbstractUpdate; - -/** - * - * @author fpalma - */ -public class V9_6_To_V9_7 extends AbstractUpdate -{ - - public V9_6_To_V9_7() - { - super(9.6,9.7,"Relacao postoDeTrabalho <-> medida"); - } - - public void doUpdate() throws Exception - { - com.evolute.utils.sql.Update update = - new com.evolute.utils.sql.Update( - "drop table hs_posto_risco;" + - "create table hs_posto_medida(" + - " posto_id int4 REFERENCES hs_posto(id)," + - " medida_id int4 REFERENCES hs_medida(id)," + - " CONSTRAINT hs_posto_medida_pkey PRIMARY KEY(posto_id,medida_id)" + - ");" + - "create table hs_relatorio_posto_medida(" + - " posto_id int4 REFERENCES hs_relatorio_posto(id)," + - " medida_id int4 REFERENCES hs_relatorio_medida(id)," + - " CONSTRAINT hs_relatorio_posto_medida_pkey PRIMARY KEY(posto_id,medida_id)" + - ");" - ); - getExecuter().executeQuery( update ); - } - - public String toString() - { - return "v" + getStartVersion() + " para v" + getEndVersion(); - } -} diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V9_7_To_V9_8.java b/trunk/SIPRPSoft/src/siprp/update/updates/V9_7_To_V9_8.java deleted file mode 100644 index 2528dbe3..00000000 --- a/trunk/SIPRPSoft/src/siprp/update/updates/V9_7_To_V9_8.java +++ /dev/null @@ -1,39 +0,0 @@ -package siprp.update.updates; - -import com.evolute.module.updater.AbstractUpdate; - -/** - * - * @author fpalma - */ -public class V9_7_To_V9_8 extends AbstractUpdate -{ - - public V9_7_To_V9_8() - { - super(9.7,9.8,"Relacao postoDeTrabalho <-> risco"); - } - - @Override - public void doUpdate() throws Exception - { - com.evolute.utils.sql.Update update = - new com.evolute.utils.sql.Update( - "create table hs_posto_risco(" + - " posto_id int4 REFERENCES hs_posto(id)," + - " risco_id int4 REFERENCES hs_risco(id)," + - " probabilidade int4," + - " severidade int4," + - " valor_qualitativo int4 REFERENCES hs_relatorio_risco_valor_qualitativo," + - " CONSTRAINT hs_posto_risco_pkey PRIMARY KEY(posto_id, risco_id)" + - ");" + - "ALTER TABLE hs_relatorio_risco DROP COLUMN is_plano_actuacao;" + - "ALTER TABLE hs_posto_risco ADD COLUMN is_plano_actuacao char(1);" + - "insert into hs_relatorio_risco_valor_qualitativo (description) values('Controlado');" + - "insert into hs_relatorio_risco_valor_qualitativo (description) values('Incontrolado');" + - "insert into hs_relatorio_risco_valor_qualitativo (description) values('Indeterminado');" - ); - getExecuter().executeQuery( update ); - } - -} diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V9_8_To_V9_9.java b/trunk/SIPRPSoft/src/siprp/update/updates/V9_8_To_V9_9.java deleted file mode 100644 index 1a8c0f7f..00000000 --- a/trunk/SIPRPSoft/src/siprp/update/updates/V9_8_To_V9_9.java +++ /dev/null @@ -1,48 +0,0 @@ -package siprp.update.updates; - -import com.evolute.module.updater.AbstractUpdate; -import com.evolute.utils.db.Executer; - -/** - * - * @author fpalma - */ -public class V9_8_To_V9_9 extends AbstractUpdate -{ - - public V9_8_To_V9_9() - { - super(9.8,9.9,"Criacao de tabelas para associacao de emails e riscos a empresas"); - } - - @Override - public void doUpdate() throws Exception - { - Executer executer = getExecuter(); - com.evolute.utils.sql.Update update = - new com.evolute.utils.sql.Update( - "alter table hs_posto_medida add column is_plano_actuacao char(1); " + - "create table hs_email( " + - " id serial PRIMARY KEY, " + - " email varchar(128) " + - "); " + - "create table hs_email_estabelecimento( " + - " email_id int4 REFERENCES hs_email(id), " + - " estabelecimento_id int4 REFERENCES estabelecimentos(id), " + - " constraint hs_email_estabelecimento_pkey PRIMARY KEY(email_id,estabelecimento_id) " + - "); " + - "create table hs_email_empresa( " + - " email_id int4 REFERENCES hs_email(id), " + - " empresa_id int4 REFERENCES empresas(id), " + - " constraint hs_email_empresa_pkey PRIMARY KEY(email_id,empresa_id) " + - "); " + - "create table hs_risco_empresa( " + - " risco_id int4 REFERENCES hs_risco(id), " + - " empresa_id int4 REFERENCES empresas(id), " + - " constraint hs_risco_empresa_pkey PRIMARY KEY(risco_id,empresa_id) " + - ");" - ); - executer.executeQuery( update ); - } - -} diff --git a/trunk/SIPRPSoft/src/siprp/update/updates/V9_9_To_V10_0.java b/trunk/SIPRPSoft/src/siprp/update/updates/V9_9_To_V10_0.java deleted file mode 100644 index 4f5018fe..00000000 --- a/trunk/SIPRPSoft/src/siprp/update/updates/V9_9_To_V10_0.java +++ /dev/null @@ -1,54 +0,0 @@ -package siprp.update.updates; - -import com.evolute.module.updater.AbstractUpdate; -import com.evolute.utils.db.Executer; - -/** - * - * @author fpalma - */ -public class V9_9_To_V10_0 extends AbstractUpdate -{ - - public V9_9_To_V10_0() - { - super(9.9,10.0,"extensao da definicao de 'relatorio de higiene e seguranca'"); - } - - @Override - public void doUpdate() - throws Exception - { - Executer executer = getExecuter(); - com.evolute.utils.sql.Update update = - new com.evolute.utils.sql.Update( - "create table hs_relatorio_legislacao( " + - " hs_relatorio_id int4 REFERENCES hs_relatorio(id), " + - " hs_legislacao_id int4 REFERENCES hs_legislacao(id), " + - " CONSTRAINT hs_relatorio_legislacao_pkey PRIMARY KEY (hs_relatorio_id,hs_legislacao_id) " + - "); " + - "create table hs_relatorio_normalizacao( " + - " hs_relatorio_id int4 REFERENCES hs_relatorio(id), " + - " hs_normalizacao_id int4 REFERENCES hs_normalizacao(id), " + - " CONSTRAINT hs_relatorio_normalizacao_pkey PRIMARY KEY (hs_relatorio_id,hs_normalizacao_id) " + - "); " + - "create table hs_relatorio_equipamento_medico( " + - " hs_relatorio_id int4 REFERENCES hs_relatorio(id), " + - " hs_equipamento_medico_id int4 REFERENCES hs_equipamento_medico(id), " + - " CONSTRAINT hs_relatorio_equipamento_medico_pkey PRIMARY KEY (hs_relatorio_id,hs_equipamento_medico_id) " + - "); " + - "alter table hs_relatorio add column avaliacao_inicial boolean; " + - "alter table hs_relatorio add column acompanhante1 varchar(256); " + - "alter table hs_relatorio add column funcao_acompanhante1 varchar(128); " + - "alter table hs_relatorio add column acompanhante2 varchar(256); " + - "alter table hs_relatorio add column funcao_acompanhante2 varchar(128); " + - "alter table hs_relatorio add column acompanhante3 varchar(256); " + - "alter table hs_relatorio add column funcao_acompanhante3 varchar(128);" + - "alter table hs_relatorio_area add column relatorio_id int4 REFERENCES hs_relatorio(id) NOT NULL; " + - "alter table hs_posto_medida drop column is_plano_actuacao;" + - "alter table hs_relatorio_posto_medida add column is_plano_actuacao boolean; " - ); - executer.executeQuery( update ); - } - -}