Skip to content
Snippets Groups Projects
Commit 3020ef11 authored by Florian Azizian's avatar Florian Azizian
Browse files

FEAT #202 fusion M2M build front

parent 9c22e437
No related branches found
No related tags found
No related merge requests found
<div id="resultInfo" class="fade" style="display:none;">
{{resultInfo}}
</div>
<div *ngIf="loading"> <div *ngIf="loading">
<i class="fa fa-spinner fa-spin fa-5x" style="margin-left: 50%;margin-top: 16%;font-size: 8em"></i> <i class="fa fa-spinner fa-spin fa-5x" style="margin-left: 50%;margin-top: 16%;font-size: 8em"></i>
</div> </div>
......
...@@ -3,12 +3,14 @@ import { RouterModule } from '@angular/router'; ...@@ -3,12 +3,14 @@ import { RouterModule } from '@angular/router';
import { ProfileComponent } from './profile.component'; import { ProfileComponent } from './profile.component';
import { SignatureBookComponent } from './signature-book.component'; import { SignatureBookComponent } from './signature-book.component';
import { SaveNumericPackageComponent } from './save-numeric-package.component';
@NgModule({ @NgModule({
imports: [ imports: [
RouterModule.forRoot([ RouterModule.forRoot([
{ path: 'profile', component: ProfileComponent }, { path: 'profile', component: ProfileComponent },
{ path: 'saveNumericPackage', component: SaveNumericPackageComponent },
{ path: 'groups/:groupId/baskets/:basketId/signatureBook/:resId', component: SignatureBookComponent }, { path: 'groups/:groupId/baskets/:basketId/signatureBook/:resId', component: SignatureBookComponent },
{ path: '**', redirectTo: '', pathMatch: 'full' }, { path: '**', redirectTo: '', pathMatch: 'full' },
], { useHash: true }), ], { useHash: true }),
......
...@@ -13,6 +13,7 @@ import { AdministrationModule } from './administration/administr ...@@ -13,6 +13,7 @@ import { AdministrationModule } from './administration/administr
import { ProfileComponent } from './profile.component'; import { ProfileComponent } from './profile.component';
import { SignatureBookComponent, SafeUrlPipe } from './signature-book.component'; import { SignatureBookComponent, SafeUrlPipe } from './signature-book.component';
import { SaveNumericPackageComponent } from './save-numeric-package.component';
@NgModule({ @NgModule({
imports: [ imports: [
...@@ -27,6 +28,7 @@ import { SignatureBookComponent, SafeUrlPipe } from './signature-book.component ...@@ -27,6 +28,7 @@ import { SignatureBookComponent, SafeUrlPipe } from './signature-book.component
declarations: [ declarations: [
AppComponent, AppComponent,
ProfileComponent, ProfileComponent,
SaveNumericPackageComponent,
SignatureBookComponent, SignatureBookComponent,
SafeUrlPipe, SafeUrlPipe,
CustomSnackbarComponent CustomSnackbarComponent
......
import { Component, OnInit, NgZone } from '@angular/core'; import { Component, OnInit, NgZone } from '@angular/core';
import { Http } from '@angular/http'; import { Http } from '@angular/http';
import 'rxjs/add/operator/map'; import { NotificationService } from './notification.service';
declare function $j(selector: any) : any; declare function $j(selector: any) : any;
...@@ -8,7 +8,7 @@ declare var angularGlobals : any; ...@@ -8,7 +8,7 @@ declare var angularGlobals : any;
@Component({ @Component({
templateUrl : "../../../../Views/save-numeric-package.component.html", templateUrl : "../../../Views/save-numeric-package.component.html",
// styleUrls : ['../../node_modules/bootstrap/dist/css/bootstrap.min.css', 'css/profile.component.css'] // styleUrls : ['../../node_modules/bootstrap/dist/css/bootstrap.min.css', 'css/profile.component.css']
}) })
export class SaveNumericPackageComponent implements OnInit { export class SaveNumericPackageComponent implements OnInit {
...@@ -24,11 +24,10 @@ export class SaveNumericPackageComponent implements OnInit { ...@@ -24,11 +24,10 @@ export class SaveNumericPackageComponent implements OnInit {
extension : "", extension : "",
}; };
resultInfo : string = "";
loading : boolean = false; loading : boolean = false;
constructor(public http: Http, private zone: NgZone) { constructor(public http: Http, private zone: NgZone, private notify: NotificationService) {
window['angularSaveNumericPackageComponent'] = { window['angularSaveNumericPackageComponent'] = {
componentAfterUpload: (base64Content: any) => this.processAfterUpload(base64Content), componentAfterUpload: (base64Content: any) => this.processAfterUpload(base64Content),
}; };
...@@ -95,14 +94,9 @@ export class SaveNumericPackageComponent implements OnInit { ...@@ -95,14 +94,9 @@ export class SaveNumericPackageComponent implements OnInit {
submitNumericPackage() { submitNumericPackage() {
if(this.numericPackage.size != 0) { if(this.numericPackage.size != 0) {
this.http.post(this.coreUrl + 'rest/saveNumericPackage', this.numericPackage) this.http.post(this.coreUrl + 'rest/saveNumericPackage', this.numericPackage)
.map(res => res.json()) .subscribe((data : any) => {
.subscribe((data) => {
if (data.errors) { if (data.errors) {
this.resultInfo = data.errors; this.notify.error(data.errors);
$j('#resultInfo').removeClass().addClass('alert alert-danger alert-dismissible');
$j("#resultInfo").fadeTo(3000, 500).slideUp(500, function(){
$j("#resultInfo").slideUp(500);
});
} else { } else {
this.numericPackage = { this.numericPackage = {
base64 : "", base64 : "",
...@@ -113,11 +107,7 @@ export class SaveNumericPackageComponent implements OnInit { ...@@ -113,11 +107,7 @@ export class SaveNumericPackageComponent implements OnInit {
extension : "", extension : "",
}; };
$j("#numericPackageFilePath").val(null); $j("#numericPackageFilePath").val(null);
this.resultInfo = 'Pli numérique correctement importé'; this.notify.success('Pli numérique correctement importé');
$j('#resultInfo').removeClass().addClass('alert alert-success alert-dismissible');
$j("#resultInfo").fadeTo(3000, 500).slideUp(500, function(){
$j("#resultInfo").slideUp(500);
});
if(data.basketRedirection != null){ if(data.basketRedirection != null){
window.location.href = data.basketRedirection; window.location.href = data.basketRedirection;
...@@ -132,11 +122,7 @@ export class SaveNumericPackageComponent implements OnInit { ...@@ -132,11 +122,7 @@ export class SaveNumericPackageComponent implements OnInit {
this.numericPackage.base64 = ""; this.numericPackage.base64 = "";
this.numericPackage.extension = ""; this.numericPackage.extension = "";
this.resultInfo = "Aucun pli numérique séléctionné"; this.notify.error("Aucun pli numérique séléctionné");
$j('#resultInfo').removeClass().addClass('alert alert-danger alert-dismissible');
$j("#resultInfo").fadeTo(3000, 500).slideUp(500, function(){
$j("#resultInfo").slideUp(500);
});
} }
} }
......
This diff is collapsed.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment