Skip to content
Snippets Groups Projects
Commit 0a7fdbdc authored by Alex ORLUC's avatar Alex ORLUC
Browse files

FEAT #5661 update css + interface

parent b70ce6c2
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
apps/maarch_entreprise/Views/status-administration.component.html
+ 121
− 52
View file @ 0a7fdbdc
<div id="resultInfo" class="fade" style="display:none;">
{{resultInfo}}
</div>
<div *ngIf="loading">
<i class="fa fa-spinner fa-spin fa-5x" style="margin-left: 50%;margin-top: 16%;font-size: 8em"></i>
</div>
<nav class="navbar navbar-default" style="font-size:17px !important;" id="toolBox">
<div class="container-fluid">
<div class="navbar-header">
<a class="navbar-brand" routerLink="/administration/status" style="cursor: pointer">
<i class="fa fa-arrow-circle-left" title="{{lang.back}}"></i>
</a>
</div>
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav navbar-right">
</ul>
</div>
</div>
</nav>
<h1 style="margin-top: 0"><i class="fa fa-check-circle fa-2x"></i> {{pageTitle}}</h1>
<div class="block">
<div id="status" class="forms" style="width:40%;margin:auto;">
<form (ngSubmit)="submitStatus()" #signatureForm="ngForm">
<div id="create" *ngIf="mode == 'create' ">
<p>
<label for="id" >{{lang.identifier}}</label>
<input name="id" id="id" type="text" [(ngModel)]="status.id" required><span class="red_asterisk"><i class="fa fa-star"></i></span>
</p>
<div class="container-fluid" style="border-left:solid 1px white;border-right:solid 1px white;background-color: #CEE9F1;border-top: solid 2px #FDD16C;border-bottom: solid 2px #FDD16C;padding:10px;">
<div class="col-md-6 col-md-offset-3">
<form class="form-horizontal" (ngSubmit)="submitStatus()" #statusFormUp="ngForm">
<div class="form-group">
<div class="col-sm-12">
<div class="input-group">
<span class="input-group-addon"><i aria-hidden="true" class="fa fa-hashtag" title="{{lang.identifier}}"></i><sup class="mandatory" title="champ requis"><i class="fa fa-asterisk" aria-hidden="true"></i></sup></span>
<input [(ngModel)]="status.id" required class="form-control" [disabled]="mode == 'update'" name="id" id="id" title="{{lang.identifier}}" type="text" required>
</div>
</div>
<div id = "update" *ngIf = "mode == 'update'">
<p>
<label for="id" >{{lang.identifier}}</label>
<input name="id" id="id" type="text" [(ngModel)]="status.id" required disabled><span class="red_asterisk"><i class="fa fa-star"></i></span>
</p>
</div>
<div class="form-group">
<div class="col-sm-12">
<div class="input-group">
<span class="input-group-addon"><i aria-hidden="true" class="fa fa-tag" title="{{lang.description}}"></i><sup class="mandatory" title="champ requis"><i class="fa fa-asterisk" aria-hidden="true"></i></sup></span>
<input class="form-control" name="label_status" id="label_status" [(ngModel)]="status.label_status" title="{{lang.description}}" type="text" required>
</div>
</div>
<p>
<label for="label_status">{{lang.description}}</label>
<textarea name="label_status" id="label_status" [(ngModel)]="status.label_status" ></textarea>
</p>
<p>
<label for="can_be_searched">{{lang.can_be_searched}}</label>
<input type="radio" name="can_be_searched" class="check" value="Y" [(ngModel)]="status.can_be_searched">Oui
<input type="radio" name="can_be_searched" class="check" value="N" [(ngModel)]="status.can_be_searched">Non
</p>
<p>
<label for="can_be_modified">{{lang.can_be_modified}}</label>
<input type="radio" name="can_be_modified" class="check" value="Y" [(ngModel)]="status.can_be_modified"checked="checked">Oui
<input type="radio" name="can_be_modified" class="check" value="N" [(ngModel)]="status.can_be_modified">Non
</p>
<p>
<label for="is_folder_status">{{lang.is_folder_status}}</label>
<input type="radio" name="is_folder_status" class="check" value="Y" [(ngModel)]="status.is_folder_status">Oui
<input type="radio" name="is_folder_status" class="check" value="N" [(ngModel)]="status.is_folder_status">Non
</p>
<p>
<label for="img_filename">{{lang.img_related}}</label>
<textarea name="img_filename" id="img_filename" [(ngModel)]="status.img_filename" ></textarea>
</p>
<p class="button" style="text-align:center">
<button class="btn btn-success" type="submit">{{lang.validate}}</button>
<button class="btn btn-warning" routerLink='/administration/status'>{{lang.cancel}}</button>
</p>
</form>
</div>
</div>
<div class="form-group">
<div class="col-sm-4">
<div class="input-group">
<span class="input-group-btn">
<button data-tooltip-content="#infoSearchableTooltip" class="btn btn-default help" type="button"><i class="fa fa-question-circle"></i></button>
</span>
<label class="form-control" for="can_be_searched">{{lang.can_be_searched}}</label>
<span class="input-group-addon">
<input [(ngModel)]="status.can_be_searched" [checked]="status.can_be_searched == 'Y'" name="can_be_searched" id="can_be_searched" type="checkbox">
</span>
</div>
</div>
<div class="col-sm-4">
<div class="input-group">
<span class="input-group-btn">
<button data-tooltip-content="#infoCanBeModifiedTooltip" class="btn btn-default help" type="button"><i class="fa fa-question-circle"></i></button>
</span>
<label class="form-control" for="can_be_modified">{{lang.can_be_modified}}</label>
<span class="input-group-addon">
<input [(ngModel)]="status.can_be_modified" [checked]="status.can_be_modified == 'Y'" type="checkbox" name="can_be_modified" id="can_be_modified">
</span>
</div>
</div>
<div class="col-sm-4">
<div class="input-group">
<span class="input-group-btn">
<button data-tooltip-content="#infoIsFolderStatusTooltip" class="btn btn-default help" type="button"><i class="fa fa-question-circle"></i></button>
</span>
<label class="form-control" for="is_folder_status">{{lang.is_folder_status}}</label>
<span class="input-group-addon">
<input [(ngModel)]="status.is_folder_status" type="checkbox" name="is_folder_status" id="is_folder_status">
</span>
</div>
</div>
</div>
<div id="statusIconList" class="form-group panel panel-default">
<div class="col-sm-12 panel-heading" style="font-size: 14px;text-align:center;">
<i class="fa fa-picture-o" aria-hidden="true"></i> {{lang.img_related}}
</div>
<div class="col-sm-12 panel-body">
<button type="button" class="btn btn-default btn-group-lg"><i id="img_0" class="fm fm-letter-status-new"></i></button>
<button type="button" class="btn btn-default btn-group-lg"><i id="img_0" class="fm fm-letter-status-inprogress"></i></button>
<button type="button" class="btn btn-default btn-group-lg"><i id="img_0" class="fm fm-letter-status-info"></i></button>
<button type="button" class="btn btn-default btn-group-lg"><i id="img_0" class="fm fm-letter-status-wait"></i></button>
<button type="button" class="btn btn-default btn-group-lg"><i id="img_0" class="fm fm-letter-status-validated"></i></button>
<button type="button" class="btn btn-default btn-group-lg"><i id="img_0" class="fm fm-letter-status-rejected"></i></button>
<button type="button" class="btn btn-default btn-group-lg"><i id="img_0" class="fm fm-letter-status-end"></i></button>
<button type="button" class="btn btn-default btn-group-lg"><i id="img_0" class="fm fm-letter-status-newmail"></i></button>
<button type="button" class="btn btn-default btn-group-lg"><i id="img_0" class="fm fm-letter-status-attr"></i></button>
<button type="button" class="btn btn-default btn-group-lg"><i id="img_0" class="fm fm-letter-status-arev"></i></button>
<button type="button" class="btn btn-default btn-group-lg"><i id="img_0" class="fm fm-letter-status-aval"></i></button>
<button type="button" class="btn btn-default btn-group-lg"><i id="img_0" class="fm fm-letter-status-aimp"></i></button>
<button type="button" class="btn btn-default btn-group-lg"><i id="img_0" class="fm fm-letter-status-imp"></i></button>
<button type="button" class="btn btn-default btn-group-lg"><i id="img_0" class="fm fm-letter-status-aenv"></i></button>
<button [ngClass]="[status.img_filename == 'fm-letter-status-acla' ? 'btn-primary' : 'btn-default']" type="button" class="btn btn-group-lg"><i id="img_0" class="fm fm-letter-status-acla"></i></button>
<button type="button" class="btn btn-default btn-group-lg"><i id="img_0" class="fm fm-letter-status-aarch"></i></button>
<button type="button" class="btn btn-default btn-group-lg"><i id="img_0" class="fm fm-letter"></i></button>
<button type="button" class="btn btn-default btn-group-lg"><i id="img_0" class="fm fm-letter-add"></i></button>
<button type="button" class="btn btn-default btn-group-lg"><i id="img_0" class="fm fm-letter-search"></i></button>
<button type="button" class="btn btn-default btn-group-lg"><i id="img_0" class="fm fm-letter-del"></i></button>
<button type="button" class="btn btn-default btn-group-lg"><i id="img_0" class="fm fm-letter-incoming"></i></button>
<button type="button" class="btn btn-default btn-group-lg"><i id="img_0" class="fm fm-letter-outgoing"></i></button>
<button type="button" class="btn btn-default btn-group-lg"><i id="img_0" class="fm fm-letter-internal"></i></button>
<button type="button" class="btn btn-default btn-group-lg"><i id="img_0" class="fm fm-file-fingerprint"></i></button>
</div>
</div>
<div class="col-sm-12 panel-body" style="text-align:center;">
<button class="btn btn-default" type="submit" [disabled]="!statusFormUp.form.valid">{{lang.validate}}</button>
<button class="btn btn-default" routerLink='/administration/status'>{{lang.cancel}}</button>
</div>
</form>
</div>
</div>
<div class="tooltip_templates" style="display: none">
<span id="infoSearchableTooltip">
Si <b>NON coché</b>,<br/>
le statut <b>{{status.id}}</b> ne vous sera <b>PAS proposé</b> pour le critère de recherche STATUS de la recherche avancée de documents.
</span>
<span id="infoCanBeModifiedTooltip">
si <b>NON coché</b>,<br/>
vous ne pourrez <b>PAS modifier</b> les meta-données des documents ayant le statut <b>{{status.id}}</b>.
</span>
<span id="infoIsFolderStatusTooltip">
si <b>coché</b>,<br/>
Le statut <b>{{status.id}}</b> pourra être utilisé pour des <b>bannettes de dossiers</b>.
</span>
</div>
\ No newline at end of file
apps/maarch_entreprise/css/engine.css
+ 32
− 0
View file @ 0a7fdbdc
......@@ -18,6 +18,9 @@
box-shadow: 0px 0px 5px 0px #656565;
filter:progid:DXImageTransform.Microsoft.Shadow(color=#656565, Direction=NaN, Strength=5);
}
form .form-group{
margin-bottom: 15px;
}
/* toolbox in admin */
#toolBox{
......@@ -124,4 +127,33 @@ a.next{
}
.dataTables_length{
float:none !important;
}
.tooltipster-sidetip.tooltipster-maarch .tooltipster-box {
background: white;
border: solid 2px #009DC5;
border-radius: 3px;
box-shadow: 5px 5px 2px 0 rgba(0,0,0,0.4);
width: 300px;
}
.tooltipster-sidetip.tooltipster-maarch .tooltipster-content {
color: #666;
padding: 8px;
}
.help{
background: none !important;
border: none !important;
}
.help:active,.help:hover{
background: none !important;
border: none !important;
}
.help i{
font-size: 10px;
position: relative;
top: -6px;
right: -6px;
}
\ No newline at end of file
apps/maarch_entreprise/js/angular/app/status-administration.component.js
+ 31
− 2
View file @ 0a7fdbdc
......@@ -29,12 +29,15 @@ var StatusAdministrationComponent = (function () {
img_filename: null
};
this.lang = "";
this.loading = false;
this.resultInfo = "";
}
StatusAdministrationComponent.prototype.ngOnInit = function () {
var _this = this;
this.loading = true;
this.coreUrl = angularGlobals.coreUrl;
this.prepareStatus();
this.updateBreadcrumb(angularGlobals.applicationName);
this.route.params.subscribe(function (params) {
if (_this.route.toString().includes('update')) {
_this.mode = 'update';
......@@ -50,13 +53,20 @@ var StatusAdministrationComponent = (function () {
_this.pageTitle = _this.lang.newStatus;
});
}
setTimeout(function () {
$j(".help").tooltipster({
theme: 'tooltipster-maarch',
interactive: true
});
}, 0);
});
this.loading = false;
};
StatusAdministrationComponent.prototype.prepareStatus = function () {
$j('#inner_content').remove();
};
StatusAdministrationComponent.prototype.updateBreadcrumb = function (applicationName) {
$j('#ariane').html("<a href='index.php?reinit=true'>" + applicationName + "</a> ><a href='index.php?page=admin&reinit=true'> Administration des statuts</a>");
$j('#ariane')[0].innerHTML = "<a href='index.php?reinit=true'>" + applicationName + "</a> > <a onclick='location.hash = \"/administration\"' style='cursor: pointer'>Administration</a> > <a onclick='location.hash = \"/administration/status\"' style='cursor: pointer'>Statuts</a> > Modification";
};
StatusAdministrationComponent.prototype.getStatusInfos = function (statusId) {
var _this = this;
......@@ -72,8 +82,27 @@ var StatusAdministrationComponent = (function () {
}
else {
_this.status = data['status'][0];
if (_this.status.can_be_searched == 'Y') {
_this.status.can_be_searched = true;
}
else {
_this.status.can_be_searched = false;
}
if (_this.status.can_be_modified == 'Y') {
_this.status.can_be_modified = true;
}
else {
_this.status.can_be_modified = false;
}
if (_this.status.is_folder_status == 'Y') {
_this.status.is_folder_status = true;
}
else {
_this.status.is_folder_status = false;
}
_this.lang = data['lang'];
_this.pageTitle = _this.lang.modify_status + ' : ' + _this.status.id;
console.log(_this.status);
}
});
};
......@@ -127,7 +156,7 @@ var StatusAdministrationComponent = (function () {
StatusAdministrationComponent = __decorate([
core_1.Component({
templateUrl: angularGlobals['status-administrationView'],
styleUrls: ['../../node_modules/bootstrap/dist/css/bootstrap.min.css']
styleUrls: ['../../node_modules/bootstrap/dist/css/bootstrap.min.css', 'css/status-administration.component.css']
}),
__metadata("design:paramtypes", [http_1.Http, router_1.ActivatedRoute, router_1.Router])
], StatusAdministrationComponent);
......
apps/maarch_entreprise/js/angular/app/status-administration.component.ts
+ 44
− 19
View file @ 0a7fdbdc
......@@ -8,34 +8,37 @@ declare function $j(selector: any) : any;
declare var angularGlobals : any;
@Component({
templateUrl : angularGlobals['status-administrationView'],
styleUrls : ['../../node_modules/bootstrap/dist/css/bootstrap.min.css']
styleUrls : ['../../node_modules/bootstrap/dist/css/bootstrap.min.css', 'css/status-administration.component.css']
})
export class StatusAdministrationComponent implements OnInit {
coreUrl : string;
pageTitle : string = "" ;
mode : string = null;
statusId : string;
type : string;
status : any = {
id : null,
label_status : null,
can_be_searched : null,
can_be_modified : null,
is_folder_status : null,
img_filename : null
};
paramDateTemp : string;
lang : any = "";
coreUrl : string;
pageTitle : string = "" ;
mode : string = null;
statusId : string;
type : string;
status : any = {
id : null,
label_status : null,
can_be_searched : null,
can_be_modified : null,
is_folder_status : null,
img_filename : null
};
paramDateTemp : string;
lang : any = "";
resultInfo : string = "";
loading : boolean = false;
resultInfo : string = "";
constructor(public http: Http, private route: ActivatedRoute, private router: Router) {
}
ngOnInit(): void {
this.loading = true;
this.coreUrl = angularGlobals.coreUrl;
this.prepareStatus();
this.updateBreadcrumb(angularGlobals.applicationName);
this.route.params.subscribe((params) => {
if(this.route.toString().includes('update')){
......@@ -51,8 +54,14 @@ export class StatusAdministrationComponent implements OnInit {
this.pageTitle = this.lang.newStatus;
});
}
setTimeout(() => {
$j(".help").tooltipster({
theme: 'tooltipster-maarch',
interactive: true
});
}, 0);
});
this.loading = false;
}
prepareStatus() {
......@@ -60,7 +69,7 @@ export class StatusAdministrationComponent implements OnInit {
}
updateBreadcrumb(applicationName: string){
$j('#ariane').html("<a href='index.php?reinit=true'>" + applicationName + "</a> ><a href='index.php?page=admin&reinit=true'> Administration des statuts</a>");
$j('#ariane')[0].innerHTML = "<a href='index.php?reinit=true'>" + applicationName + "</a> > <a onclick='location.hash = \"/administration\"' style='cursor: pointer'>Administration</a> > <a onclick='location.hash = \"/administration/status\"' style='cursor: pointer'>Statuts</a> > Modification";
}
getStatusInfos(statusId : string){
......@@ -75,8 +84,24 @@ export class StatusAdministrationComponent implements OnInit {
});
} else {
this.status = data['status'][0];
if(this.status.can_be_searched == 'Y'){
this.status.can_be_searched = true;
}else{
this.status.can_be_searched = false;
}
if(this.status.can_be_modified == 'Y'){
this.status.can_be_modified = true;
}else{
this.status.can_be_modified = false;
}
if(this.status.is_folder_status == 'Y'){
this.status.is_folder_status = true;
}else{
this.status.is_folder_status = false;
}
this.lang = data['lang'];
this.pageTitle = this.lang.modify_status + ' : ' + this.status.id;
console.log(this.status);
}
});
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment