From c5eeecee44b461a04be928135cf0c6a8fc19bb2f Mon Sep 17 00:00:00 2001 From: RuanNascimentoSantos Date: Thu, 16 Nov 2017 13:00:07 -0300 Subject: [PATCH] =?UTF-8?q?-=20Corre=C3=A7=C3=B5es=20no=20changelog=20de?= =?UTF-8?q?=20vers=C3=B5es?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../update_hotfix_loadmaster_2017.txt | 12 ++++ app/migrations/update_tmp_censo_2017.txt | 22 ++++++++ config.php | 17 +++++- instance.php | 6 +- themes/default/views/site/index.php | 55 +++++++++---------- 5 files changed, 81 insertions(+), 31 deletions(-) create mode 100644 app/migrations/update_hotfix_loadmaster_2017.txt create mode 100644 app/migrations/update_tmp_censo_2017.txt diff --git a/app/migrations/update_hotfix_loadmaster_2017.txt b/app/migrations/update_hotfix_loadmaster_2017.txt new file mode 100644 index 000000000..2957f118f --- /dev/null +++ b/app/migrations/update_hotfix_loadmaster_2017.txt @@ -0,0 +1,12 @@ +ALTER TABLE `classroom` CHANGE `fkid` `hash` BIGINT NULL; +ALTER TABLE `instructor_documents_and_address` CHANGE `fkid` `hash` BIGINT NULL; +ALTER TABLE `instructor_identification` CHANGE `fkid` `hash` BIGINT NULL; +ALTER TABLE `instructor_teaching_data` CHANGE `fkid` `hash` BIGINT NULL; +ALTER TABLE `instructor_variable_data` CHANGE `fkid` `hash` BIGINT NULL; +ALTER TABLE `student_documents_and_address` CHANGE `fkid` `hash` BIGINT NULL; +ALTER TABLE `student_enrollment` CHANGE `fkid` `hash` BIGINT NULL; +ALTER TABLE `student_identification` CHANGE `fkid` `hash` BIGINT NULL; +ALTER TABLE `student_enrollment` ADD COLUMN `hash_classroom` BIGINT NULL AFTER `admission_type`, ADD COLUMN `hash_student` BIGINT NULL AFTER `hash_classroom`; +ALTER TABLE `instructor_teaching_data` ADD COLUMN `hash_instructor` BIGINT NULL AFTER `hash`, ADD COLUMN `hash_classroom` BIGINT NULL AFTER `hash_instructor`; +ALTER TABLE `student_enrollment` +ADD COLUMN `status` TINYINT(1) NULL DEFAULT NULL; diff --git a/app/migrations/update_tmp_censo_2017.txt b/app/migrations/update_tmp_censo_2017.txt new file mode 100644 index 000000000..44b2c8dc0 --- /dev/null +++ b/app/migrations/update_tmp_censo_2017.txt @@ -0,0 +1,22 @@ +ALTER TABLE `instructor_variable_data` + CHANGE `id` `id` INT(11) NOT NULL; +ALTER TABLE `instructor_documents_and_address` + CHANGE `id` `id` INT(11) NOT NULL; +ALTER TABLE `student_documents_and_address` + CHANGE `id` `id` INT(11) NOT NULL; +UPDATE classroom +SET `pedagogical_mediation_type` = 1 +WHERE `pedagogical_mediation_type` IS NULL AND school_year = 2017; + +UPDATE student_enrollment a +JOIN classroom b ON(a.`classroom_fk`= b.id) +SET `vehicle_type_bus` = 1 +WHERE +public_transport=1 AND +school_year=2017; + + +SELECT * FROM classroom +WHERE +school_year=2017; + diff --git a/config.php b/config.php index 109d8fc00..7cac07999 100755 --- a/config.php +++ b/config.php @@ -1,6 +1,21 @@ + + TAG VERSÃO 2.10.7.2: +
+ + '); if(YII_DEBUG){ defined('YII_TRACE_LEVEL') or define('YII_TRACE_LEVEL',3); error_reporting(E_ALL); diff --git a/instance.php b/instance.php index 12e33fb2d..247133286 100755 --- a/instance.php +++ b/instance.php @@ -96,10 +96,14 @@ $instance = 'VANDA'; $db = 'io.escola.vanda'; break; - default: + case 'boquim': $instance = 'BOQUIM'; $db = 'io.escola.se.boquim'; break; + default: + $instance = 'SERGIPE'; + $db = 'io.escola.se'; + break; } define("FORMS",serialize($_FORMS)); define("DBNAME",$db); diff --git a/themes/default/views/site/index.php b/themes/default/views/site/index.php index c4468f1a8..43ab39e65 100755 --- a/themes/default/views/site/index.php +++ b/themes/default/views/site/index.php @@ -91,12 +91,8 @@ function isInInterval($start, $end, $day, $month) {
- Novos formulários incluídos: Guia de Transferência, Declaração, Ata de Rendimento --> -
- - Mural de Avisos: -
- No momento estamos atualizando nossos sistemas... -
+ +
+
+
+
Etapas da pré-matrícula
+
+
+ + Reaproveitamento das turmas +
+
+ + Pré-matrícula dos alunos +
+
+ + Impressão das fichas +
+
+ + Confirmação de matrícula +
+
+
+
format("d/m") . ": Término do
-
-
-
Etapas da pré-matrícula
-
-
- - Reaproveitamento das turmas -
-
- - Pré-matrícula dos alunos -
-
- - Impressão das fichas -
-
- - Confirmação de matrícula -
-
-
-
+