Responsiv assignment

H2-invent · Jun 29, 2020 · 193032e · 193032e
1 parent 83b300c
commit 193032e
Show file tree

Hide file tree

Showing 5 changed files with 63 additions and 13 deletions.
diff --git a/public/icons/online-learning.svg b/public/icons/online-learning.svg
diff --git a/src/Controller/DashboardController.php b/src/Controller/DashboardController.php
@@ -8,6 +8,7 @@
 
 namespace App\Controller;
 
+use App\Entity\AkademieBuchungen;
 use App\Entity\AuditTom;
 use App\Entity\Datenweitergabe;
 use App\Entity\Kontakte;
@@ -73,6 +74,8 @@ public function dashboard()
         $assignDsfa = $this->getUser()->getAssignedDsfa()->toarray();
         $assignDatenweitergabe = $this->getUser()->getAssignedDatenweitergaben()->toarray();
 
+        $buchungen = $this->getDoctrine()->getRepository(AkademieBuchungen::class)->findActivBuchungenByUser($this->getUser());
+
         return $this->render('dashboard/index.html.twig', [
             'controller_name' => 'DashboardController',
             'team' => $team,
@@ -89,7 +92,8 @@ public function dashboard()
             'assignDaten' => $assignDatenweitergabe,
             'assignVvt' => $assignVvt,
             'assignAudit' => $assignAudit,
-            'assignDsfa' => $assignDsfa
+            'assignDsfa' => $assignDsfa,
+            'akademie' => $buchungen
         ]);
     }
 }
diff --git a/src/Repository/AkademieBuchungenRepository.php b/src/Repository/AkademieBuchungenRepository.php
@@ -3,8 +3,8 @@
 namespace App\Repository;
 
 use App\Entity\AkademieBuchungen;
+use App\Entity\User;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
-use Doctrine\DBAL\Types\DateType;
 use Doctrine\Persistence\ManagerRegistry;
 
 /**
@@ -58,6 +58,16 @@ public function findMyBuchungenByUser($value)
             ->getResult();
     }
 
+    public function findActivBuchungenByUser(User $user)
+    {
+        return $this->createQueryBuilder('a')
+            ->andWhere('a.user = :user')
+            ->andWhere('a.abgeschlossen = 0')
+            ->setParameter('user', $user)
+            ->getQuery()
+            ->getResult();
+    }
+
     public function findBuchungenByTeam($team, $kurs)
     {
         return $this->createQueryBuilder('a')

diff --git a/templates/base/__sidenav.html.twig b/templates/base/__sidenav.html.twig
@@ -81,7 +81,9 @@
     <ul class="list-unstyled CTAs">
         {% if app.user.akademieUser %}
             <li>
-                <a href="{{ path('akademie') }}" class="btn bg-akademie">Zur Akademie</a>
+                <a href="{{ path('akademie') }}" class="btn bg-akademie"><img style="height: 30px"
+                                                                              src="{{ asset('icons/online-learning.svg') }}">
+                    Akademie</a>
             </li>
         {% endif %}
     </ul>

diff --git a/templates/dashboard/__assign.html.twig b/templates/dashboard/__assign.html.twig
@@ -8,33 +8,59 @@
     <div class="card-body">
         <ul class="nav nav-tabs" id="audit-tab" role="tablist">
             <li class="nav-item">
-                <a class="nav-link active text-center" id="home-tab" data-toggle="tab" href="#audit" role="tab"
+                <a class="nav-link active text-center" id="home-tab" data-toggle="tab" href="#akademie" role="tab"
                    aria-controls="home"
-                   aria-selected="true"><img style="height: 30px" src="{{ asset('icons/pruefung.svg') }}"> <span
-                            class="d-none d-sm-block">Audit</span></a>
+                   aria-selected="true"><img style="height: 1.5rem" src="{{ asset('icons/online-learning.svg') }}">
+                    <span
+                            class="d-none d-lg-block">Akademie</span></a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link text-center" id="home-tab" data-toggle="tab" href="#audit" role="tab"
+                   aria-controls="home"
+                   aria-selected="true"><img style="height: 1.5rem" src="{{ asset('icons/pruefung.svg') }}"> <span
+                            class="d-none d-lg-block">Audit</span></a>
             </li>
             <li class="nav-item">
                 <a class="nav-link text-center" id="vvt-tab" data-toggle="tab" href="#vvt" role="tab"
                    aria-controls="profile"
-                   aria-selected="false"><img style="width: 30px" src="{{ asset('icons/prozess.svg') }}"> <span
-                            class="d-none d-sm-block">VVT</span></a>
+                   aria-selected="false"><img style="width: 1.5rem" src="{{ asset('icons/prozess.svg') }}"> <span
+                            class="d-none d-lg-block">VVT</span></a>
             </li>
             <li class="nav-item">
                 <a class="nav-link text-center" id="dsfa-tab" data-toggle="tab" href="#dsfa" role="tab"
                    aria-controls="contact"
-                   aria-selected="false"><img style="width: 30px" src="{{ asset('icons/dsfa.svg') }}"> <span
-                            class="d-none d-sm-block">DSFA</span></a>
+                   aria-selected="false"><img style="width: 1.5rem" src="{{ asset('icons/dsfa.svg') }}"> <span
+                            class="d-none d-lg-block">DSFA</span></a>
             </li>
             <li class="nav-item">
                 <a class="nav-link text-center" id="daten-tab" data-toggle="tab" href="#daten" role="tab"
                    aria-controls="contact"
-                   aria-selected="false"><img style="width: 30px" src="{{ asset('icons/data.svg') }}"> <span
-                            class="d-none d-sm-block">DW</span></a>
+                   aria-selected="false"><img style="width: 1.5rem" src="{{ asset('icons/data.svg') }}"> <span
+                            class="d-none d-lg-block">DW</span></a>
             </li>
         </ul>
 
         <div class="tab-content" id="myTabContent">
-            <div class="tab-pane fade show active" id="audit" role="tabpanel" aria-labelledby="home-tab">
+            <div class="tab-pane fade show active" id="akademie" role="tabpanel" aria-labelledby="home-tab">
+                {% for a in akademie %}
+                    <a href="{{ path('audit_tom_edit',{'tom':a.id}) }}">
+                        <div class="btn btn-block bg-akademie text-md-left mt-1">
+                            <div class="row">
+                                <div class="col-md-1">
+                                    <img style="width: 21px" src="{{ asset('icons/online-learning.svg') }}">
+                                </div>
+                                <div class="col-md-7">
+                                    {{ a.kurs.title }}
+                                </div>
+                                <div class="col-md-4">
+                                    {{ a.zugewiesen|date('d.m.Y') }}
+                                </div>
+                            </div>
+                        </div>
+                    </a>
+                {% endfor %}
+            </div>
+            <div class="tab-pane fade show" id="audit" role="tabpanel" aria-labelledby="home-tab">
                 {% for a in assignAudit |slice(0, 6)|sort((a, b) => b.createdAt <=> a.createdAt) %}
                     {% if a.activ %}
                         <a href="{{ path('audit_tom_edit',{'tom':a.id}) }}">