Download as
Browse Code »

Commit 28e7b8f77cfac6419b493a2a644ff56357ae948f

Authored by Everton Muniz
1 parent 51e7f627
Exists in 2.8 and in 6 other branches 2.2, 2.3, 2.4, 2.5, 2.6, 2.7

Ajustes na tela de atualização de matrícula em massa

Showing 6 changed files with 42 additions and 8 deletions   Show diff stats
app/Http/Controllers/UpdateRegistrationStatusController.php
  Diff comments   View file @28e7b8f
@@ -63,6 +63,8 @@ class UpdateRegistrationStatusController extends Controller @@ -63,6 +63,8 @@ class UpdateRegistrationStatusController extends Controller
63 $query->where('ref_ref_cod_serie', $request->get('ref_cod_serie')); 63 $query->where('ref_ref_cod_serie', $request->get('ref_cod_serie'));
64 } 64 }
65 65
  66 + $query->where('aprovado', $request->get('situacao'));
  67 +
66 $registrations = $query->get(); 68 $registrations = $query->get();
67 69
68 DB::beginTransaction(); 70 DB::beginTransaction();
@@ -81,6 +83,6 @@ class UpdateRegistrationStatusController extends Controller @@ -81,6 +83,6 @@ class UpdateRegistrationStatusController extends Controller
81 83
82 DB::commit(); 84 DB::commit();
83 85
84 - return redirect()->route('update-registration-status.index')->with('success', count($registrations) . ' matrículas atualizadas com sucesso'); 86 + return redirect()->route('update-registration-status.index')->with('success', count($registrations) . ' matrículas atualizadas com sucesso.');
85 } 87 }
86 } 88 }
app/Process.php
  Diff comments   View file @28e7b8f
@@ -23,7 +23,6 @@ class Process @@ -23,7 +23,6 @@ class Process
23 const RECLASSIFY_REGISTRATION = 1004; 23 const RECLASSIFY_REGISTRATION = 1004;
24 const UNDO_STUDENT_UNIFICATION = 2001; 24 const UNDO_STUDENT_UNIFICATION = 2001;
25 const EXEMPTION_LIST = 2002; 25 const EXEMPTION_LIST = 2002;
26 - const UPDATE_REGISTRATION_STATUS = 2003;  
27 -  
28 const ALLOW_VACANCY_RESERVATION_REPORT_WITHOUT_SCHOOL = 2003; 26 const ALLOW_VACANCY_RESERVATION_REPORT_WITHOUT_SCHOOL = 2003;
  27 + const UPDATE_REGISTRATION_STATUS = 2005;
29 } 28 }
database/migrations/2019_12_09_144923_change_process_update_registration_status_menu.php 0 → 100644
  Diff comments   View file @28e7b8f
@@ -0,0 +1,32 @@ @@ -0,0 +1,32 @@
  1 +<?php
  2 +
  3 +use App\Menu;
  4 +use App\Process;
  5 +use Illuminate\Database\Migrations\Migration;
  6 +
  7 +class ChangeProcessUpdateRegistrationStatusMenu extends Migration
  8 +{
  9 + /**
  10 + * Run the migrations.
  11 + *
  12 + * @return void
  13 + */
  14 + public function up()
  15 + {
  16 + Menu::query()->where('link', '/atualiza-situacao-matriculas')->update(
  17 + [
  18 + 'process' => Process::UPDATE_REGISTRATION_STATUS,
  19 + ]
  20 + );
  21 + }
  22 +
  23 + /**
  24 + * Reverse the migrations.
  25 + *
  26 + * @return void
  27 + */
  28 + public function down()
  29 + {
  30 + //
  31 + }
  32 +}
ieducar/intranet/include/pmieducar/clsPmieducarTurma.inc.php
  Diff comments   View file @28e7b8f
@@ -1212,6 +1212,7 @@ class clsPmieducarTurma extends Model @@ -1212,6 +1212,7 @@ class clsPmieducarTurma extends Model
1212 $whereAnd = ' AND '; 1212 $whereAnd = ' AND ';
1213 } 1213 }
1214 if (is_numeric($int_ref_ref_cod_serie)) { 1214 if (is_numeric($int_ref_ref_cod_serie)) {
  1215 + $mult = '';
1215 if ($bool_verifica_serie_multiseriada == true) { 1216 if ($bool_verifica_serie_multiseriada == true) {
1216 $mult = " OR t.ref_ref_cod_serie_mult = '{$int_ref_ref_cod_serie}' "; 1217 $mult = " OR t.ref_ref_cod_serie_mult = '{$int_ref_ref_cod_serie}' ";
1217 } 1218 }
resources/views/form/select-year.blade.php
  Diff comments   View file @28e7b8f
1 <span class="form"> 1 <span class="form">
2 - <input type="text" class="geral" name="ano" id="ano" maxlength="4" value="{{old('ano', Request::get('ano'))}}" size="4"> 2 + <input type="text" class="geral" name="ano" id="ano" maxlength="4" value="{{old('ano', Request::get('ano', date('Y')))}}" size="4">
3 </span> 3 </span>
resources/views/registration/update-registration-status/index.blade.php
  Diff comments   View file @28e7b8f
@@ -90,17 +90,17 @@ @@ -90,17 +90,17 @@
90 </td> 90 </td>
91 </tr> 91 </tr>
92 <tr id="tr_nm_turma"> 92 <tr id="tr_nm_turma">
93 - <td class="formmdtd" valign="top"><span class="form">Turma</span></td>  
94 - <td class="formmdtd" valign="top"> 93 + <td class="formlttd" valign="top"><span class="form">Turma</span></td>
  94 + <td class="formlttd" valign="top">
95 @include('form.select-school-class') 95 @include('form.select-school-class')
96 </td> 96 </td>
97 </tr> 97 </tr>
98 <tr id="tr_nm_serie"> 98 <tr id="tr_nm_serie">
99 - <td class="formlttd" valign="top"> 99 + <td class="formmdtd" valign="top">
100 <span class="form">Situação</span> 100 <span class="form">Situação</span>
101 <span class="campo_obrigatorio">*</span> 101 <span class="campo_obrigatorio">*</span>
102 </td> 102 </td>
103 - <td class="formlttd" valign="top"> 103 + <td class="formmdtd" valign="top">
104 <span class="form"> 104 <span class="form">
105 <select class="geral" name="situacao" id="situacao" style="width: 308px;"> 105 <select class="geral" name="situacao" id="situacao" style="width: 308px;">
106 <option value="">Selecione</option> 106 <option value="">Selecione</option>