Skip to content

Commit

Permalink
v5.1.0 - 'secretaria' update
Browse files Browse the repository at this point in the history
  • Loading branch information
joaotapparo committed Dec 9, 2022
1 parent 5b07565 commit eab7280
Show file tree
Hide file tree
Showing 47 changed files with 121 additions and 121 deletions.
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
APP_NAME=schoolary
APP_ENV=local
APP_KEY=base64:7IvVZVZNlhJFLk6CxOj8ves1PASonAvrZdZIERyzGEM=
APP_KEY=base64:Ueaq44igk8UUHzHekptVp+o3l/hON2xpXAsHY/xidjM=
APP_DEBUG=true
APP_URL=http://localhost

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ docker exec -it app sh
↳php artisan migrate:fresh --seed
login: admin@puccampinas.edu.br
login: secretaria@puccampinas.edu.br
senha: password
Utilizar: http://localhost:8080/
Expand Down
2 changes: 1 addition & 1 deletion composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion database/factories/UserFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public function definition()
'city' => 'Dhaka',
'zip' => '32545',
'Foto' => null,
'role' => 'admin',
'role' => 'secretaria',
];
}

Expand Down
2 changes: 1 addition & 1 deletion database/seeders/PermissionSeeder.php
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ public function run()
// Permission::create(['name' => 'delete sections']);

$user = \App\Models\User::factory()->create([
'email' => 'admin@puccampinas.edu.br',
'email' => 'secretaria@puccampinas.edu.br',
'primeiro_nome' => 'Leandro',
'sobrenome' => 'Xastre'
]);
Expand Down
2 changes: 1 addition & 1 deletion resources/views/exams/index.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
</thead>
<tbody>
@foreach ($exams as $exam)
@if (Auth::user()->role == "admin")
@if (Auth::user()->role == "secretaria")
<tr>
<td>{{$exam->exam_name}}</td>
<td>{{$exam->course->course_name}}</td>
Expand Down
4 changes: 2 additions & 2 deletions resources/views/home.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,12 @@
</div>
</div>

@if(Auth::user()->role == "admin")
@if(Auth::user()->role == "secretaria")
<div class="row align-items-md-stretch mt-4">
<div style="text-align:center;">
<div class="col">
<div class="p-3 text-white bg-dark rounded-3">
<h3> Seja bem vindo a area logada da admin!</h3>
<h3> Seja bem vindo a area logada da secretaria!</h3>
</div>
</div>
</div>
Expand Down
12 changes: 6 additions & 6 deletions resources/views/layouts/left-menu.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class="ms-2 d-inline d-sm-none d-md-none d-xl-inline">Alunos</span>
style="{{ request()->routeIs('aluno.list.show')? 'font-weight:bold;' : '' }}"><a
class="nav-link" href="{{route('aluno.list.show')}}"><i
class="bi bi-person-bounding-box me-2"></i>Vizualizar Alunos</a></li>
@if (!session()->has('browse_session_id') && Auth::user()->role == "admin")
@if (!session()->has('browse_session_id') && Auth::user()->role == "secretaria")
<li class="nav-item w-100"
style="{{ request()->routeIs('aluno.create.show')? 'font-weight:bold;' : '' }}"><a
class="nav-link" href="{{route('aluno.create.show')}}"><i
Expand All @@ -66,7 +66,7 @@ class="ms-2 d-inline d-sm-none d-md-none d-xl-inline">Professores</span>
style="{{ request()->routeIs('teacher.list.show')? 'font-weight:bold;' : '' }}"><a
class="nav-link" href="{{route('teacher.list.show')}}"><i
class="bi bi-person-bounding-box me-2"></i>Vizualizar Professores</a></li>
@if (!session()->has('browse_session_id') && Auth::user()->role == "admin")
@if (!session()->has('browse_session_id') && Auth::user()->role == "secretaria")
<li class="nav-item w-100"
style="{{ request()->routeIs('teacher.create.show')? 'font-weight:bold;' : '' }}"><a
class="nav-link" href="{{route('teacher.create.show')}}"><i
Expand Down Expand Up @@ -137,13 +137,13 @@ class="d-flex nav-link {{ request()->is('exams*')? 'active' : '' }}"><i class="b
<li class="nav-item w-100"
style="{{ request()->routeIs('exam.list.show')? 'font-weight:bold;' : '' }}"><a class="nav-link"
href="{{route('exam.list.show')}}"><i class="bi bi-calculator-fill me-2"></i> Ver Provas</a></li>
@if (Auth::user()->role == "admin" || Auth::user()->role == "teacher")
@if (Auth::user()->role == "secretaria" || Auth::user()->role == "teacher")
<li class="nav-item w-100"
style="{{ request()->routeIs('exam.create.show')? 'font-weight:bold;' : '' }}"><a
class="nav-link" href="{{route('exam.create.show')}}"><i class="bi bi-calculator-fill me-2"></i>
Criar Prova</a></li>
@endif
@if (Auth::user()->role == "admin")
@if (Auth::user()->role == "secretaria")
<li class="nav-item w-100"
style="{{ request()->routeIs('exam.grade.system.create')? 'font-weight:bold;' : '' }}"><a
class="nav-link" href="{{route('exam.grade.system.create')}}"><i
Expand All @@ -157,7 +157,7 @@ class="bi bi-calculator-fill me-2"></i> Ver grade</a></li>
</li>
@endif

@if (Auth::user()->role == "admin")
@if (Auth::user()->role == "secretaria")
<li class="nav-item">
<a class="nav-link {{ request()->is('notice*')? 'active' : '' }}" href="{{route('notice.create')}}"><i
class="bi-bell-fill"></i> <span
Expand All @@ -180,7 +180,7 @@ class="ms-1 d-inline d-sm-none d-md-none d-xl-inline">Cronograma</span></a>
</li>
@endif

@if (Auth::user()->role == "admin")
@if (Auth::user()->role == "secretaria")
<li class="nav-item">
<a class="nav-link {{ request()->is('academics*')? 'active' : '' }}"
href="{{url('academics/settings')}}"><i class="bi bi-gear-fill"></i> <span
Expand Down
2 changes: 1 addition & 1 deletion resources/views/promotions/promote.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</h1>
@include('session-messages')
<p class="text-danger">
<small><i class="bi bi-exclamation-diamond-fill me-2"></i> alunos must be promoted only once to a new Session. Ususally, admin will create a New Session once Academic activity ends for the Current Session.</small>
<small><i class="bi bi-exclamation-diamond-fill me-2"></i> alunos must be promoted only once to a new Session. Ususally, secretaria will create a New Session once Academic activity ends for the Current Session.</small>
</p>
<div class="mb-4 mt-4">
<form action="{{route('promotions.store')}}" method="POST">
Expand Down
2 changes: 1 addition & 1 deletion vendor/composer/installed.json
Original file line number Diff line number Diff line change
Expand Up @@ -714,7 +714,7 @@
"authors": [
{
"name": "Edward Z. Yang",
"email": "admin@htmlpurifier.org",
"email": "secretaria@htmlpurifier.org",
"homepage": "http://ezyang.com"
}
],
Expand Down
2 changes: 1 addition & 1 deletion vendor/ezyang/htmlpurifier/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"authors": [
{
"name": "Edward Z. Yang",
"email": "admin@htmlpurifier.org",
"email": "secretaria@htmlpurifier.org",
"homepage": "http://ezyang.com"
}
],
Expand Down
2 changes: 1 addition & 1 deletion vendor/facade/ignition/resources/compiled/ignition.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion vendor/fakerphp/faker/src/Faker/Provider/de_AT/Address.php
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ class Address extends \Faker\Provider\Address
'Oberndorf bei Salzburg', 'Oberpullendorf', 'Oberwart', 'Oberwölz',
'Perg', 'Peuerbach', 'Pinkafeld', 'Pöchlarn', 'Poysdorf', 'Pregarten', 'Pressbaum', 'Pulkau', 'Purbach am Neusiedler See', 'Purkersdorf',
'Raabs an der Thaya', 'Radenthein', 'Radstadt', 'Rattenberg', 'Retz', 'Ried im Innkreis', 'Rohrbach-Berg', 'Rottenmann', 'Rust',
'Saalfelden am Steinernen Meer', 'Salzburg', 'Sankt Andrä', 'St. Johann im Pongau', 'St. Pölten', 'St. Valentin', 'Sankt Veit an der Glan', 'Schärding', 'Scheibbs', 'Schladming', 'Schrattenthal', 'Schrems', 'Schwanenstadt', 'Schwaz', 'Schwechat', 'Seekirchen am Wallersee', 'Spielberg', 'Spittal an der Drau', 'Stadtschlaining', 'Steyr', 'Steyregg', 'Stockerau', 'Straßburg',
'Saalfelden am Steinernen Meer', 'Salzburg', 'Sankt Andrä', 'St. Johann im Pongau', 'St. Pölten', 'St. Valentin', 'Sankt Veit an der Glan', 'Schärding', 'Scheibbs', 'Schlsecretariag', 'Schrattenthal', 'Schrems', 'Schwanenstadt', 'Schwaz', 'Schwechat', 'Seekirchen am Wallersee', 'Spielberg', 'Spittal an der Drau', 'Stadtschlaining', 'Steyr', 'Steyregg', 'Stockerau', 'Straßburg',
'Ternitz', 'Traiskirchen', 'Traismauer', 'Traun', 'Trieben', 'Trofaiach', 'Tulln an der Donau',
'Villach', 'Vils', 'Vöcklabruck', 'Voitsberg', 'Völkermarkt',
'Waidhofen an der Thaya', 'Waidhofen an der Ybbs', 'Weitra', 'Weiz', 'Wels', 'Wien', 'Wiener Neustadt', 'Wieselburg', 'Wilhelmsburg', 'Wolfsberg', 'Wolkersdorf im Weinviertel', 'Wörgl',
Expand Down
4 changes: 2 additions & 2 deletions vendor/fakerphp/faker/src/Faker/Provider/de_CH/Person.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
class Person extends \Faker\Provider\de_DE\Person
{
/**
* @see http://www.bfs.admin.ch/bfs/portal/de/index/themen/01/02/blank/dos/prenoms/02.html
* @see http://www.bfs.secretaria.ch/bfs/portal/de/index/themen/01/02/blank/dos/prenoms/02.html
*/
protected static $firstNameMasculino = [
'Adolf', 'Adrian', 'Alain', 'Albert', 'Alessandro', 'Alex', 'Alexander', 'Alfred', 'Ali', 'Alois', 'Andrea', 'Andreas', 'Andrin', 'André', 'Angelo', 'Anton', 'Antonio', 'Armin', 'Arnold', 'Arthur',
Expand Down Expand Up @@ -33,7 +33,7 @@ class Person extends \Faker\Provider\de_DE\Person
];

/**
* @see http://www.bfs.admin.ch/bfs/portal/de/index/themen/01/02/blank/dos/prenoms/02.html
* @see http://www.bfs.secretaria.ch/bfs/portal/de/index/themen/01/02/blank/dos/prenoms/02.html
*/
protected static $firstNameFeminino = [
'Adelheid', 'Agnes', 'Alessia', 'Alexandra', 'Alice', 'Alina', 'Aline', 'Ana', 'Andrea', 'Angela', 'Angelika', 'Anita', 'Anja', 'Anna', 'Annemarie', 'Antonia', 'Astrid',
Expand Down
2 changes: 1 addition & 1 deletion vendor/fakerphp/faker/src/Faker/Provider/el_GR/Text.php
Original file line number Diff line number Diff line change
Expand Up @@ -2391,7 +2391,7 @@ class Text extends \Faker\Provider\Text
royalties for any exercise by You of the rights granted under this
License; and, Voluntary License Schemes. The Licensor waives the right
to collect royalties, whether individually or, in the event that the
Licensor is a member of a collecting society that administers
Licensor is a member of a collecting society that secretariaisters
voluntary licensing schemes, via that society, from any exercise by
You of the rights granted under this License. The above rights may be
exercised in all media and formats whether now known or hereafter
Expand Down
2 changes: 1 addition & 1 deletion vendor/fakerphp/faker/src/Faker/Provider/en_IN/Person.php
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ class Person extends \Faker\Provider\Person
'Lata', 'Lalita', 'Leela', 'Leelawati', 'Lakshmi', 'Laveena',
'Madhu', 'Madhavi', 'Maya', 'Mayawati', 'Megha', 'Mona', 'Mridula', 'Mukti', 'Meghana', 'Manjari', 'Mukti', 'Mini', 'Munni', 'Monica',
'Nagma', 'Naina', 'Nalini', 'Namita', 'Nancy', 'Nandini', 'Namita', 'Narmada', 'Neela', 'Neha', 'Nidhi', 'Nikita', 'Nilam', 'Nilima', 'Nishi', 'Nishita', 'Nupoor', 'Nutan', 'Nitika', 'Niyati', 'Nupur', 'Navami', 'Nishtha',
'Padama', 'Padmini', 'Payal', 'Poonam', 'Prabha', 'Priyanka', 'Pushpa', 'Pooja', 'Prerna', 'Pamela', 'Pinky', 'Parminder', 'Preshita',
'Padama', 'Psecretariai', 'Payal', 'Poonam', 'Prabha', 'Priyanka', 'Pushpa', 'Pooja', 'Prerna', 'Pamela', 'Pinky', 'Parminder', 'Preshita',
'Radha', 'Radhika', 'Ragini', 'Rakhi', 'Richa', 'Riddhi', 'Ritika', 'Riya', 'Rohini', 'Roma', 'Ruchi', 'Rachel', 'Rita', 'Rosey', 'Rimi', 'Runjhun',
'Sabina', 'Sameera', 'Sameedha', 'Sapna', 'Sara', 'Seema', 'Shanti', 'Sheetal', 'Shobha', 'Savita', 'Smriti', 'Sneha', 'Sona', 'Sunita', 'Supriya', 'Sushmita', 'Swati', 'Sweta', 'Shweta', 'Sukriti',
'Tanuja', 'Tejaswani', 'Tulsi', 'Trishana', 'Teena',
Expand Down
Loading

0 comments on commit eab7280

Please sign in to comment.