diff --git a/apps/maarch_entreprise/Views/activate-user.component.html b/apps/maarch_entreprise/Views/activate-user.component.html
index 6f7450c2b23e5d4284ee39e7bef7188838437996..4ea0539df39031b0936f61cde2e1fa910383f692 100644
--- a/apps/maarch_entreprise/Views/activate-user.component.html
+++ b/apps/maarch_entreprise/Views/activate-user.component.html
@@ -1,32 +1,26 @@
<div class="admin-container" [class.admin-is-mobile]="mobileQuery.matches">
- <mat-toolbar color="primary" class="admin-toolbar">
- <button mat-button (click)="snav.toggle()">
- <mat-icon class="maarchLogo" [svgIcon]="mobileQuery.matches ? 'maarchLogoOnly' : 'maarchLogo'"></mat-icon>
- </button>
- <h1 class="admin-toolbar-title text-center" style="color:white">{{lang.missingAdvertTitle}}
- </h1>
- <span style="flex: 1 1 auto;"></span>
- <menu-top></menu-top>
- </mat-toolbar>
- <mat-sidenav-container class="admin-sidenav-container" [style.marginTop.px]="mobileMode ? 56 : 0">
- <mat-sidenav #snav [mode]="mobileMode ? 'over' : 'side'" [fixedInViewport]="mobileMode" fixedTopGap="56" [opened]="mobileMode ? false : true"
- autoFocus="false">
- <menu-nav></menu-nav>
- <mat-divider></mat-divider>
- <menu-shortcut></menu-shortcut>
- </mat-sidenav>
- <mat-sidenav-content>
- <div *ngIf="loading" style="display:flex;height:100%;">
- <mat-spinner style="margin:auto;"></mat-spinner>
- </div>
- <div *ngIf="!loading" class="text-center" style="position:relative; top:50px;">
- {{lang.missingAdvert}}<br>
- {{lang.missingAdvert2}}<br>
- {{lang.missingChoose}}<br>
- <br>
- <button mat-raised-button color="primary" type="button" (click)="deleteAbsence()">{{lang.validate}}</button>
- <button mat-raised-button color="primary" type="button" (click)="logout()">{{lang.cancel}}</button>
- </div>
- </mat-sidenav-content>
- </mat-sidenav-container>
- </div>
\ No newline at end of file
+ <mat-toolbar color="primary" class="admin-toolbar">
+ <button mat-button>
+ <mat-icon class="maarchLogo" [svgIcon]="mobileQuery.matches ? 'maarchLogoOnly' : 'maarchLogo'"></mat-icon>
+ </button>
+ <h1 class="admin-toolbar-title text-center" style="color:white">{{lang.missingAdvertTitle}}
+ </h1>
+ <span style="flex: 1 1 auto;"></span>
+ <menu-top></menu-top>
+ </mat-toolbar>
+ <mat-sidenav-container class="admin-sidenav-container">
+ <mat-sidenav-content>
+ <div *ngIf="loading" style="display:flex;height:100%;">
+ <mat-spinner style="margin:auto;"></mat-spinner>
+ </div>
+ <div *ngIf="!loading" class="text-center" style="position:relative; top:50px;">
+ {{lang.missingAdvert}}<br>
+ {{lang.missingAdvert2}}<br>
+ {{lang.missingChoose}}<br>
+ <br>
+ <button mat-raised-button color="primary" type="button" (click)="activateUser()">{{lang.validate}}</button>
+ <button mat-raised-button color="primary" type="button" (click)="logout()">{{lang.cancel}}</button>
+ </div>
+ </mat-sidenav-content>
+ </mat-sidenav-container>
+</div>
\ No newline at end of file
diff --git a/apps/maarch_entreprise/index.php b/apps/maarch_entreprise/index.php
index 920a75ae2f42b80e049dc62db2256f0ec0a96850..80b58eeb2294a367b556798a7b8c27700806e5d5 100755
--- a/apps/maarch_entreprise/index.php
+++ b/apps/maarch_entreprise/index.php
@@ -358,12 +358,7 @@ if (file_exists($path)) {
echo '<div id="return_previsualise_thes" style="display: none; border-radius: 10px; box-shadow: 10px 10px 15px rgba(0, 0, 0, 0.4); padding: 10px; width: auto; height: auto; position: fixed; top: 0; left: 0; z-index: 99999; color: #4f4b47; text-shadow: -1px -1px 0px rgba(255,255,255,0.2);background:#FFF18F;border-radius:5px;overflow:auto;">\';<input type="hidden" id="identifierDetailFrame" value="" /></div>';
- if ($core->is_module_loaded('basket')
- && isset($_SESSION['abs_user_status'])
- && $_SESSION['abs_user_status'] == true && !empty($_REQUEST['triggerAngular'])) {
- /*include
- 'modules/basket/advert_missing.php';*/
- } elseif (empty($_REQUEST['triggerAngular'])) {
+ if (empty($_REQUEST['triggerAngular'])) {
$core->insert_page();
}
?>
@@ -390,13 +385,9 @@ if (file_exists($path)) {
if (!empty($_REQUEST['triggerAngular']) && $_REQUEST['triggerAngular'] == 'changePass') {
?><script>triggerAngular('#/password-modification')</script><?php
} elseif (!empty($_REQUEST['triggerAngular']) && $_REQUEST['triggerAngular'] == 'activateUser') {
- ?><script>triggerAngular('#/activateUser')</script><?php
- }
- elseif ($_SESSION['user']['UserId'] == 'superadmin' && !empty($_REQUEST['administration'])) {
- ?>
- <script>triggerAngular('#/administration')</script>
- <?php
-
+ ?><script>triggerAngular('#/activate-user')</script><?php
+ } elseif ($_SESSION['user']['UserId'] == 'superadmin' && !empty($_REQUEST['administration'])) {
+ ?><script>triggerAngular('#/administration')</script><?php
}
?>
</html>
diff --git a/apps/maarch_entreprise/js/angular/app/activate-user.component.ts b/apps/maarch_entreprise/js/angular/app/activate-user.component.ts
index 38fdba14a5dc7bf65d45f654cb3782589a3f23e5..4e9695fd7eabd8fba2b534c65586c0242cffecf3 100644
--- a/apps/maarch_entreprise/js/angular/app/activate-user.component.ts
+++ b/apps/maarch_entreprise/js/angular/app/activate-user.component.ts
@@ -1,12 +1,10 @@
-import { Component, OnInit, ChangeDetectorRef, ViewChild} from '@angular/core';
+import { Component, OnInit, ChangeDetectorRef} from '@angular/core';
import { HttpClient } from '@angular/common/http';
import { MediaMatcher } from '@angular/cdk/layout';
import { NotificationService } from './notification.service';
import { LANG } from './translate.component';
-import { MatDialog, MatDialogRef, MatSidenav, MatExpansionPanel } from '@angular/material';
declare var angularGlobals: any;
-declare function $j(selector: any): any;
@Component({
templateUrl: "../../../Views/activate-user.component.html",
@@ -14,14 +12,14 @@ declare function $j(selector: any): any;
})
export class ActivateUserComponent implements OnInit {
- private _mobileQueryListener: () => void;
+
+ private _mobileQueryListener : () => void;
+ mobileQuery : MediaQueryList;
+
coreUrl : string;
- mobileQuery : MediaQueryList;
lang : any = LANG;
loading : boolean = false;
- user : any = {
-
- }
+
constructor( media: MediaMatcher, changeDetectorRef: ChangeDetectorRef, public http: HttpClient, private notify: NotificationService){
this.mobileQuery = media.matchMedia('(max-width: 768px)');
@@ -29,33 +27,22 @@ export class ActivateUserComponent implements OnInit {
this.mobileQuery.addListener(this._mobileQueryListener);
}
-
ngOnInit() : void {
this.coreUrl = angularGlobals.coreUrl;
- this.loading = true;
- this.http.get('../../rest/currentUser/profile')
- .subscribe((data: any) => {
- this.user = data;
- this.loading = false;
- });
+ this.loading = false;
}
- deleteAbsence() : void {
- this.http.put('../../rest/users/'+this.user.id+'/status', {'id' : this.user.id, 'status' : 'OK'})
+ activateUser() : void {
+ this.http.put(this.coreUrl + 'rest/users/' + angularGlobals.user.id + '/status', {'status' : 'OK'})
.subscribe(() => {
- this.notify.success(this.lang.statusUpdated);
+ this.notify.success(this.lang.absOff);
location.href = "index.php";
- },
- (err : any) => {
+ }, (err : any) => {
this.notify.error(err.error.errors);
});
}
- redirect() {
- location.href = "index.php";
- }
-
logout() {
location.href = "index.php?display=true&page=logout&logout=true";
}
-}
\ No newline at end of file
+}
diff --git a/apps/maarch_entreprise/js/angular/app/app-routing.module.ts b/apps/maarch_entreprise/js/angular/app/app-routing.module.ts
index bad406d4034c8c7890e99e08c339563e9c568a3a..f51db2658f4be64800d58cfa3f512b10110ce2d9 100755
--- a/apps/maarch_entreprise/js/angular/app/app-routing.module.ts
+++ b/apps/maarch_entreprise/js/angular/app/app-routing.module.ts
@@ -1,21 +1,21 @@
import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
+import { ActivateUserComponent } from './activate-user.component';
+import { PasswordModificationComponent } from './password-modification.component';
import { ProfileComponent } from './profile.component';
import { AboutUsComponent } from './about-us.component';
-import { PasswordModificationComponent } from './password-modification.component';
import { SignatureBookComponent } from './signature-book.component';
import { SaveNumericPackageComponent } from './save-numeric-package.component';
-import { ActivateUserComponent } from './activate-user.component';
@NgModule({
imports: [
RouterModule.forRoot([
+ { path: 'activate-user', component: ActivateUserComponent},
+ { path: 'password-modification', component: PasswordModificationComponent },
{ path: 'profile', component: ProfileComponent },
{ path: 'about-us', component: AboutUsComponent },
- { path: 'password-modification', component: PasswordModificationComponent },
{ path: 'saveNumericPackage', component: SaveNumericPackageComponent },
- { path: 'activateUser', component: ActivateUserComponent},
{ path: 'groups/:groupId/baskets/:basketId/signatureBook/:resId', component: SignatureBookComponent },
{ path: '**', redirectTo: '', pathMatch: 'full' },
], { useHash: true }),
diff --git a/modules/basket/advert_missing.php b/modules/basket/advert_missing.php
deleted file mode 100755
index 5d34559eb3354fbc130a6cb6f631da20650044f6..0000000000000000000000000000000000000000
--- a/modules/basket/advert_missing.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-/*
-*
-* Copyright 2008,2009 Maarch
-*
-* This file is part of Maarch Framework.
-*
-* Maarch Framework is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* Maarch Framework is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with Maarch Framework. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/**
-* @brief Page displayed when reconnecting after an absence
-*
-* @file
-* @author Claire Figueras <dev@maarch.org>
-* @date $date$
-* @version $Revision$
-* @ingroup basket
-*/
-
-if (isset($_POST['value']) && $_POST['value'] == "submit")
-{
-
- $db = new Database();
- require_once('modules'.DIRECTORY_SEPARATOR.'basket'.DIRECTORY_SEPARATOR.'class'.DIRECTORY_SEPARATOR.'class_modules_tools.php');
-
- $bask = new basket();
- $bask->cancel_abs($_SESSION['user']['UserId']);
-
- $_SESSION['abs_user_status'] = false;
- if($_SESSION['history']['userabs'] == "true")
- {
- require_once("core".DIRECTORY_SEPARATOR."class".DIRECTORY_SEPARATOR."class_history.php");
- $history = new history();
- $stmt = $db->query("select firstname, lastname from ".$_SESSION['tablename']['users']." where user_id = ?",array($this_user));
- $res = $stmt->fetchObject();
- $history->add($_SESSION['tablename']['users'],$this_user,"RET",'userabs', $res->firstname." ".$res->lastname.' '._BACK_FROM_VACATION, $_SESSION['config']['databasetype']);
- }
- ?>
- <script type="text/javascript"> window.location.href="<?php echo $_SESSION['config']['businessappurl'];?>index.php";</script>
- <?php
- exit();
-}
-?>
-<h1 ><i class="fa fa-question-circle" align="middle" /></i><?php echo _MISSING_ADVERT_TITLE;?></h1>
-<div id="inner_content" class="clearfix">
-<h2 class="tit" align="center"><?php echo _MISSING_ADVERT_01;?></h2>
-<p align="center"><?php echo _MISSING_ADVERT_02;?> </p>
-<p align="center"><?php echo _MISSING_CHOOSE;?></p>
-
-<form name="redirect_form" method="post" action="<?php echo $_SESSION['config']['businessappurl'];?>index.php?page=advert_missing&module=basket">
- <p align="center">
- <input name="value" type="hidden" value="submit">
- <input name="cancel" type="submit" value="<?php echo _CONTINUE;?>" align="middle" class="button" />
- <input name="cancel" type="button" value="<?php echo _CANCEL;?>" onclick="window.location.href='<?php echo $_SESSION['config']['businessappurl'];?>index.php?display=true&page=logout';" align="middle" class="button" />
- </p>
-</form>
-</div>
diff --git a/modules/basket/class/class_modules_tools_Abstract.php b/modules/basket/class/class_modules_tools_Abstract.php
index dee0a085ca899034b080db3085c3573f65802eca..83c8a9aa35246960f3f6aceca21055b45126719f 100755
--- a/modules/basket/class/class_modules_tools_Abstract.php
+++ b/modules/basket/class/class_modules_tools_Abstract.php
@@ -103,7 +103,6 @@ abstract class basket_Abstract extends Database
{
$_SESSION['user']['baskets'] = [];
- $this->_loadActivityUser($userData['UserId']);
$this->_loadBasketsPages();
$user = \User\models\UserModel::getByUserId(['userId' => $userData['UserId'], 'select' => ['id']]);
@@ -428,26 +427,6 @@ abstract class basket_Abstract extends Database
}
}
- /**
- * Loads status from users and create var when he's missing.
- *
- */
- protected function _loadActivityUser($userId)
- {
- if ( isset($userId) ) {
- $db = new Database();
- $stmt = $db->query(
- "SELECT status from " . USERS_TABLE . " where user_id=?",array($userId));
- $line = $stmt-> fetchObject();
-
- if ($line->status == 'ABS') {
- $_SESSION['abs_user_status'] = true;
- } else {
- $_SESSION['abs_user_status'] = false;
- }
- }
- }
-
public function translates_actions_to_json($actions = array())
{
$jsonActions = '{';