[FEAT] [PROFILE V2] Fix absence modal

apps/maarch_entreprise/js/angular/app/Views/profile.html

@@ -87,6 +87,7 @@ h2{
     vertical-align:top;
   }
 </style>
+<h1 style="margin-top: 10px">Mon profil</h1>
 <div id="resultInfo" class="fade" style="display:none;">
     {{resultInfo}}
 </div>
@@ -107,7 +108,7 @@ h2{
                         <!--<a data-toggle="modal" data-target="#manageAbs" ><i class="fa fa-user-times" title=""></i> Gérer mes absences </a>-->
                     <!--</li>-->
                     <li style="cursor: pointer">
-                        <a onclick="createModal(modal_content, 'modal_redirect', 'auto', '950px');autocomplete(15, 'index.php?display=true&module=basket&page=autocomplete_users_list')" ><i class="fa fa-user-times" title=""></i> Gérer mes absences </a>
+                        <a (click)="absenceModal()" ><i class="fa fa-user-times" title=""></i> Gérer mes absences </a>
                     </li>
                     <li style="cursor: pointer">
                         <a data-toggle="modal" data-target="#manageSign"><i class="fa fa-user-times" title=""></i> Gérer mes signatures </a>

apps/maarch_entreprise/js/angular/app/profile.component.js

@@ -47,6 +47,9 @@ var ProfileComponent = (function () {
         $j('#inner_content').remove();
         $j('#menunav').hide();
         $j('#container').width("99%");
+        $j('#viewBasketsTitle').remove();
+        $j('#homePageWelcomeTitle').remove();
+        $j('#ariane')[0].innerHTML = "<a href='index.php?reinit=true'>MAARCH Trunk</a> > Profil";
         if (Prototype.BrowserFeatures.ElementExtensions) {
             //FIX PROTOTYPE CONFLICT
             var pluginsToDisable = ['collapse', 'dropdown', 'modal', 'tooltip', 'popover', 'tab'];
@@ -283,6 +286,10 @@ var ProfileComponent = (function () {
             }
         });
     };
+    ProfileComponent.prototype.absenceModal = function () {
+        createModal(this.user.absence, 'modal_redirect', 'auto', '950px');
+        autocomplete(15, 'index.php?display=true&module=basket&page=autocomplete_users_list');
+    };
     return ProfileComponent;
 }());
 ProfileComponent = __decorate([

apps/maarch_entreprise/js/angular/app/profile.component.ts

@@ -6,6 +6,8 @@ declare function $j(selector: any) : any;
 declare var tinymce : any;
 declare var Prototype : any;
 declare function disablePrototypeJS(method: string, plugins: any) : any;
+declare function createModal(a: string, b: string, c: string, d: string) : any;
+declare function autocomplete(a: number, b: string) : any;
 
 
 @Component({
@@ -50,6 +52,9 @@ export class ProfileComponent implements OnInit {
         $j('#inner_content').remove();
         $j('#menunav').hide();
         $j('#container').width("99%");
+        $j('#viewBasketsTitle').remove();
+        $j('#homePageWelcomeTitle').remove();
+        $j('#ariane')[0].innerHTML = "<a href='index.php?reinit=true'>MAARCH Trunk</a> > Profil";
 
         if (Prototype.BrowserFeatures.ElementExtensions) {
             //FIX PROTOTYPE CONFLICT
@@ -301,4 +306,8 @@ export class ProfileComponent implements OnInit {
             });
     }
 
+    absenceModal() {
+        createModal(this.user.absence, 'modal_redirect', 'auto', '950px');
+        autocomplete(15, 'index.php?display=true&module=basket&page=autocomplete_users_list');
+    }
 }

core/Controllers/UserController.php

@@ -21,6 +21,7 @@ use Respect\Validation\Validator;
 use Core\Models\UserModel;
 
 include_once 'core/class/docservers_controler.php';
+include_once 'modules/basket/class/class_modules_tools.php';
 
 class UserController
 {
@@ -30,11 +31,15 @@ class UserController
             return $response->withStatus(401)->withJson(['errors' => 'User Not Connected']);
         }
 
+
         $user = UserModel::getById(['userId' => $_SESSION['user']['UserId'], 'select' => ['user_id', 'firstname', 'lastname', 'phone', 'mail', 'initials', 'thumbprint']]);
         $user['signatures'] = UserModel::getSignaturesById(['userId' => $_SESSION['user']['UserId']]);
         $user['emailSignatures'] = UserModel::getEmailSignaturesById(['userId' => $_SESSION['user']['UserId']]);
         $user['groups'] = UserModel::getGroupsById(['userId' => $_SESSION['user']['UserId']]);
         $user['entities'] = UserModel::getEntitiesById(['userId' => $_SESSION['user']['UserId']]);
+        
+        $basket = new \basket();
+        $user['absence'] = $basket->redirect_my_baskets_list($_SESSION['user']['baskets'], count($_SESSION['user']['baskets']), $_SESSION['user']['UserId'], 'listingbasket specsmall');
 
         return $response->withJson($user);
     }