- Correções no changelog de versões

ipti · Nov 16, 2017 · c5eeece · c5eeece
1 parent bcac432
commit c5eeece
Show file tree

Hide file tree

Showing 5 changed files with 81 additions and 31 deletions.
diff --git a/app/migrations/update_hotfix_loadmaster_2017.txt 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
@@ -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
@@ -1,6 +1,21 @@
 <?php
 defined('YII_DEBUG') or define('YII_DEBUG',false);
-define("TAG_VERSION",'2.10.7');
+define("TAG_VERSION",'2.10.7.2');
+define("BOARD_MSG",'<div class="alert alert-success">
+		<button type="button" class="close" data-dismiss="alert">×</button>
+		<strong>TAG VERSÃO 2.10.7.2:</strong>
+		<br>
+		<ul>
+		    <li>Ampliar o acesso a funcionalidade de frequência para os demais anos.</li>
+		    <li>Sábado letivo habilitado por padrão na frequência.</li>
+		    <li>Exibir a versão do TAG na tela de Login</li>
+		    <li>Habilitar o conceito de FORMS do TAG</li>
+		    <li>Habilitado novos formulários</li>
+		    <li>Correção no relatório do Bolsa Familia restrição por escola</li>
+		    <li>Tradução do termo em inglês na tela de adicionar professor a turma de New Discipline e Data 1 e Data2</li>
+		    <li>Caixa de acompanhamento da prematricula na tela inicial</li>
+        </ul>
+	</div>');
 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
@@ -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
@@ -91,12 +91,8 @@ function isInInterval($start, $end, $day, $month) {
 		<br>
 		- Novos formulários incluídos: Guia de Transferência, Declaração, Ata de Rendimento
 	</div>-->
-	<div class="alert alert-error">
-		<button type="button" class="close" data-dismiss="alert">×</button>
-		<strong>Mural de Avisos:</strong>
-		<br>
-		No momento estamos atualizando nossos sistemas...
-	</div>
+	<?php echo BOARD_MSG; ?>
+
 	<div class="row-fluid">
 		<div class="span9">
 			<div class="widget widget-scroll widget-gray margin-bottom-none"
@@ -191,6 +187,29 @@ function isInInterval($start, $end, $day, $month) {
 					echo $html;
 				?>
 			</div>
+			<div>
+				<div class="next-events widget widget-scroll widget-gray margin-bottom-none" data-toggle="collapse-widget" data-scroll-height="223px" data-collapse-closed="false">
+					<div class="widget-head"><h5 class="heading glyphicons calendar"><i class="fa fa-bars"></i>Etapas da pré-matrícula</h5></div>
+					<div class="widget-body events in" style="height: auto;">
+						<div>
+							<i class="fa fa-circle-o left pre-enrollment-icon"></i>
+							<span class="actual-date"><strong> Reaproveitamento das turmas</strong></span>
+						</div>
+						<div>
+							<i class="fa fa-circle-o left pre-enrollment-icon"></i>
+							<span class="actual-date"><strong> Pré-matrícula dos alunos</strong></span>
+						</div>
+						<div>
+							<i class="fa fa-circle-o left pre-enrollment-icon"></i>
+							<span class="actual-date"><strong> Impressão das fichas</strong></span>
+						</div>
+						<div>
+							<i class="fa fa-circle-o left pre-enrollment-icon"></i>
+							<span class="actual-date"><strong> Confirmação de matrícula</strong></span>
+						</div>
+					</div>
+				</div>
+			</div>
 			<div>
 				<div class="next-events widget widget-scroll widget-gray margin-bottom-none"
 				     data-toggle="collapse-widget" data-scroll-height="223px"
@@ -227,29 +246,7 @@ class="fa fa-circle calendar-black"></i><?= $end->format("d/m") . ": Término do
 				</div>
 				<!---->
 			</div>
-			<div>
-				<div class="next-events widget widget-scroll widget-gray margin-bottom-none" data-toggle="collapse-widget" data-scroll-height="223px" data-collapse-closed="false">
-					<div class="widget-head"><h5 class="heading glyphicons calendar"><i class="fa fa-bars"></i>Etapas da pré-matrícula</h5></div>
-						<div class="widget-body events in" style="height: auto;">
-							<div>
-								<i class="fa fa-circle-o left pre-enrollment-icon"></i>
-								<span class="actual-date"><strong> Reaproveitamento das turmas</strong></span>
-							</div>
-							<div>
-								<i class="fa fa-circle-o left pre-enrollment-icon"></i>
-								<span class="actual-date"><strong> Pré-matrícula dos alunos</strong></span>
-							</div>
-							<div>
-								<i class="fa fa-circle-o left pre-enrollment-icon"></i>
-								<span class="actual-date"><strong> Impressão das fichas</strong></span>
-							</div>
-							<div>
-								<i class="fa fa-circle-o left pre-enrollment-icon"></i>
-								<span class="actual-date"><strong> Confirmação de matrícula</strong></span>
-							</div>
-						</div>
-					</div>
-				</div>
+
 		</div>
 	</div>
 </div>