Merge branch 'main' into topicos

lageIBUSP · Jun 20, 2024 · efc0cdb · efc0cdb
2 parents da37e6d + 14796c1
commit efc0cdb
Show file tree

Hide file tree

Showing 15 changed files with 73 additions and 56 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -0,0 +1,14 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Listen for Xdebug",
+            "type": "php",
+            "request": "launch",
+            "port": 9003,
+            "pathMappings": {
+                "/var/www/html": "${workspaceRoot}",
+            }
+        }
+    ]
+}
diff --git a/README.md b/README.md
@@ -72,5 +72,13 @@ npx cypress run
 
 Para mais detalhes, consulte a [documentação do Cypress](https://docs.cypress.io/).
 
+# Debug e profile
+
+O notaR está configurado com ferramentas de debug e profiling para ajudar no desenvolvimento. Para
+habilitar o Xdebug, abra o arquivo docker/php/php.ini, descomente a linha de xdebug.mode e construa
+novamente os containers. O debug pode ser feito na sua IDE (no VSCode, é recomendado instalar a
+extensão Xdebug) e os arquivos de profiling serão gerados na pasta storage/logs e podem ser lidos 
+com o KCacheGrind.
+
 ## Licença de uso
 O código fonte do notaR está disponível sob licença GPLv3.
diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
@@ -59,7 +59,7 @@ public function store(Request $request)
 	/**
 	 * Show the profile of a given User.
 	 *
-	 * @param  App\Models\User $user
+	 * @param  User $user
 	 * @return \Illuminate\View\View
 	 */
 	public function show(User $user)
@@ -83,7 +83,7 @@ public function show(User $user)
 	/**
 	 * Show the form for editing the specified resource.
 	 *
-	 * @param  App\Models\User $user
+	 * @param  User $user
 	 * @return \Illuminate\Http\Response
 	 */
 	public function edit(User $user)
@@ -99,7 +99,7 @@ public function edit(User $user)
 	 * Update the specified resource in storage.
 	 *
 	 * @param  \Illuminate\Http\Request  $request
-	 * @param  App\Models\User $user
+	 * @param  User $user
 	 * @return \Illuminate\Http\Response
 	 */
 	public function update(Request $request, User $user)
@@ -132,7 +132,7 @@ public function update(Request $request, User $user)
 	/**
 	 * Remove the specified resource from storage.
 	 *
-	 * @param  App\Models\User $user
+	 * @param  User $user
 	 * @return \Illuminate\Http\Response
 	 */
 	public function destroy(User $user)

diff --git a/app/Models/User.php b/app/Models/User.php
@@ -67,7 +67,7 @@ public function isAdmin() {
     /**
      * Nota final (atual) dentro do prazo (get from DB)
      *
-     * @var App\Model\Prazo $prazo
+     * @var Prazo $prazo
      * @return float
      */
     public function getNotaFinal(Prazo $prazo) {
@@ -80,7 +80,7 @@ public function getNotaFinal(Prazo $prazo) {
     /**
      * Nota final (atual) dentro do prazo
      *
-     * @var App\Model\Prazo $prazo
+     * @var Prazo $prazo
      * @return float
      */
     public function notaFinal(Prazo $prazo) {
@@ -90,7 +90,7 @@ public function notaFinal(Prazo $prazo) {
     /**
      * Notas dentro do prazo
      *
-     * @var App\Model\Prazo $prazo
+     * @var Prazo $prazo
      */
     public function notasValidas(Prazo $prazo) {
         return $this->notas

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,5 +1,4 @@
 # For more information: https://laravel.com/docs/sail
-version: '3'
 services:
     app:
         build:

diff --git a/docker-deploy.sh b/docker-deploy.sh
@@ -14,5 +14,10 @@ php artisan migrate --force
 php artisan route:clear
 php artisan config:clear
 php artisan cache:clear
-php artisan view:cache
-php artisan event:cache
+php artisan view:clear
+php artisan event:clear
+# Cache views and events only on production
+if [ "$APP_ENV" == "production" ]; then
+  php artisan view:cache
+  php artisan event:cache
+fi
diff --git a/docker/php/php.ini b/docker/php/php.ini
@@ -3,3 +3,10 @@ post_max_size = 100M
 upload_max_filesize = 100M
 variables_order = EGPCS
 pcov.directory = .
+xdebug.discover_client_host = true
+xdebug.log = /var/www/html/storage/logs/xdebug.log
+xdebug.start_with_request = true
+xdebug.mode = off
+xdebug.output_dir=/var/www/html/storage/logs/
+# Uncomment following line and rebuild containers to enable debug and profiling
+# xdebug.mode = debug,profile
diff --git a/resources/views/exercicio/index.blade.php b/resources/views/exercicio/index.blade.php
@@ -23,7 +23,7 @@
             <div class="alert alert-info">{{ Session::get('message') }}</div>
         @endif
         <!-- content -->
-        @include('exercicio.table')
+        @include('exercicio.table', ['editButton' => true])
     </div>
 
 </div>

diff --git a/resources/views/exercicio/table.blade.php b/resources/views/exercicio/table.blade.php
@@ -2,7 +2,9 @@
     <thead>
         <tr>
             <td>Título</td>
-            <td>Ações</td>
+            @if ($editButton ?? '')
+                <td>Ações</td>
+            @endif
         </tr>
     </thead>
     <tbody>
@@ -16,14 +18,18 @@
                 </a>
             </td>
 
+            @if ($editButton ?? '')
             <td>
 
                 <!-- edit -->
+                @if ($editButton ?? '')
                 @can ('edit', $value)
                 <a class="btn btn-small btn-edit" href="{{ URL::to('exercicio/' . $value->id . '/edit') }}">Editar</a>
                 @endcan
+                @endif
 
             </td>
+            @endif
         </tr>
     @endforeach
     </tbody>

diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php
@@ -14,7 +14,7 @@
 	</p>
 
 	<p>	Caso contrário, você pode fazer os exercícios que se encontram no link ao lado, sem a necessídade de cadastro. 
-    O meterial completo do curso de introdução à linguagem,  <a href= "http://ecor.ib.usp.br"> ecoR </a> da USP, 
+    O material completo do curso de introdução à linguagem,  <a href= "http://ecor.ib.usp.br"> ecoR </a> da USP, 
      que motivou o desenvolvimento desta plataforma está disponível para acesso sem custos.
 
 	</p>

diff --git a/resources/views/prazo/table.blade.php b/resources/views/prazo/table.blade.php
@@ -4,18 +4,16 @@
             @unless ($exercicio ?? "")
                 <td>Exercicio</td>
             @endif
+
             @unless ($turma ?? "")
                 <td>Turma</td>
             @endif
-            <td>Prazo</td>
+
+                <td>Prazo</td>
+
             @if ($user ?? "")
                 <td>Nota</td>
             @endif
-            @if ($turma ?? "")
-            @can ('edit', $turma)
-                <td>Ações</td>
-            @endcan
-            @endif
         </tr>
     </thead>
     <tbody>
@@ -40,34 +38,18 @@
                 </a>
                 </td>
             @endif
-            <td>{{ $value->prazo }}</td>
-            @if ($user ?? "")
+
                 <td>
-                    {{ $user->notaFinal($value) }}
+                    {{ $value->prazo }}
                 </td>
-            @endif
 
-            @if ($turma ?? "")
-            @can ('edit', $turma)
+            @if ($user ?? "")
                 <td>
-
-                    <!-- remove -->
-                    @if ($removeButton ?? '')
-                     <form method="POST" action="{{URL::to("/prazo/".$value->id)}}">
-                        {{ csrf_field() }}
-                        {{ method_field('DELETE') }}
-
-                        <div class="form-group">
-                            <input type="submit" class="btn btn-remove" value="Remover">
-                        </div>
-                    </form>
-                    @endif
-
+                    {{ $user->notaFinal($value) }}
                 </td>
-            @endcan
             @endif
+
         </tr>
     @endforeach
     </tbody>
 </table>
-
diff --git a/resources/views/turma/show.blade.php b/resources/views/turma/show.blade.php
@@ -9,7 +9,12 @@
         <h2>Membros</h2>
     </a>
     <div class="collapse show" id="collapseMembros">
-        @include('user.table',['users' => $turma->users, 'editButton' => true, 'removeButton' => true])
+        @can ('edit', $turma)
+            @include('user.table',['users' => $turma->users,
+                'removeButton' => true])
+        @else
+            @include('user.table',['users' => $turma->users])
+        @endcan
     </div>
 
     @if($prazosFuturos ?? '')

diff --git a/resources/views/user/index.blade.php b/resources/views/user/index.blade.php
@@ -14,6 +14,6 @@
     <div class="alert alert-info">{{ Session::get('message') }}</div>
 @endif
 
-@include('user.table',['editButton'=>true])
+@include('user.table')
 </div>
 @endsection
diff --git a/resources/views/user/show.blade.php b/resources/views/user/show.blade.php
@@ -34,15 +34,5 @@
     <div class="collapse show" id="collapseTurmas">
         @include('turma.table',['turmas' => $user->turmas, 'editButton' => false, 'removeButton' => true])
     </div>
-
-    <a class="collapse-button" data-toggle="collapse" href="#collapseNotas" role="button" aria-expanded="true" aria-controls="collapseNotas">
-        <h4>Todas as Notas</h4>
-    </a>
-    <div class="collapse" id="collapseNotas">
-        <div class="alert alert-info">
-            Esta tabela contém todas as notas já registradas para esse usuário. Note que para uma nota ser válida ela precisa ter data anterior ao prazo correspondente. Apenas a máxima nota válida é usada.
-        </div>
-        @include('nota.table',['notas' => $user->notas])
-    </div>
 </div>
 @endsection
diff --git a/resources/views/user/table.blade.php b/resources/views/user/table.blade.php
@@ -7,7 +7,9 @@
                 <td>Turmas</td>
             @endunless
             <td>Admin</td>
-            <td>Ações</td>
+            @if ($editButton ?? '' or $removeButton ?? '')
+                <td>Ações</td>
+            @endif
         </tr>
     </thead>
     <tbody>
@@ -44,6 +46,7 @@
                 </a>
             </td>
 
+            @if ($editButton ?? '' or $removeButton ?? '')
             <td>
 
                 <!-- edit  -->
@@ -55,14 +58,12 @@
 
                 <!-- remove -->
                 @if ($removeButton ?? '')
-                @can ('edit', $turma)
                 <a class="btn btn-small btn-remove" href="{{ URL::to('turma/' . $turma->id . '/remove/'.$value->id) }}">Remover</a>
-                @endcan
                 @endif
 
             </td>
+            @endif
         </tr>
     @endforeach
     </tbody>
 </table>
-