Skip to content

Commit 72e0434

Browse files
skadefroskadefro
committed
add loading spinner
1 parent 972001c commit 72e0434

18 files changed

Lines changed: 75 additions & 33 deletions

‎OpenFlow/src/public/Auditlogs.html‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
<div class="row" id="title">
2-
<h1 translate lib="web">auditlogs</h1>
2+
<div class="col-sm">
3+
<h1 translate lib="web">auditlogs</h1>
4+
</div>
5+
<div class="col-sm"></div>
6+
<div class="col-sm text-right">
7+
<i class="fas fa-cog fa-spin" ng-show="ctrl.loading==true"></i>
8+
</div>
39
</div>
10+
411
<style>
512
.failed {
613
border-color: red !important;

‎OpenFlow/src/public/Clients.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ <h1 translate lib="web">clients</h1>
55
<div class="col-md-6">
66
</div>
77
<div class=" col-md-6 text-right">
8+
<i class="fas fa-cog fa-spin" ng-show="ctrl.loading==true"></i>
89
<input type="checkbox" ng-model="ctrl.showinactive" ng-change="ctrl.loadData()"> <span translate lib="web"
910
ng-click="ctrl.showinactive = !ctrl.showinactive; ctrl.loadData()">showinactive</span>
1011
<input type="radio" name="show" value="openrpa" ng-model="ctrl.show" ng-change="ctrl.loadData()"> <span translate

‎OpenFlow/src/public/Controllers.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6046,7 +6046,7 @@ export class DeletedCtrl extends entitiesCtrl<Base> {
60466046
});
60476047
}
60486048
async loadData(): Promise<void> {
6049-
6049+
this.loading = true;
60506050
var query: any = { _deleted: { "$exists": true } };
60516051
if ((this.searchstring as string).indexOf("{") == 0) {
60526052
if ((this.searchstring as string).lastIndexOf("}") == ((this.searchstring as string).length - 1)) {
@@ -6075,6 +6075,7 @@ export class DeletedCtrl extends entitiesCtrl<Base> {
60756075
this.models = await NoderedUtil.Query(this.collection + "_hist",
60766076
query, { name: 1, _type: 1, _createdby: 1, _created: 1, _modified: 1, _deleted: 1, _version: 1, id: 1 }, this.orderby, 100, 0, null,
60776077
null, null, 2);
6078+
this.loading = false;
60786079
this.processdata();
60796080
}
60806081
processdata() {
@@ -6085,6 +6086,7 @@ export class DeletedCtrl extends entitiesCtrl<Base> {
60856086
this.userdata.data.DeletedCtrl.orderby = this.orderby;
60866087
this.userdata.data.DeletedCtrl.searchstring = this.searchstring;
60876088
this.userdata.data.DeletedCtrl.basequeryas = this.basequeryas;
6089+
this.loading = false;
60886090
if (!this.$scope.$$phase) { this.$scope.$apply(); }
60896091
}
60906092
SelectCollection() {

‎OpenFlow/src/public/Credentials.html‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,16 @@
22
<h1 translate lib="web">credentials</h1>
33
</div>
44
<div class="col-sm-12 text-right">
5+
<i class="fas fa-cog fa-spin" ng-show="ctrl.loading==true"></i>
56
<a href="#/Credential" class="btn" translate lib="web">addcredential</a>
67
</div>
78
<div ng-show="ctrl.errormessage != ''"" class=" alert alert-danger" role="alert">{{ctrl.errormessage}}</div>
89
<table id="table1" class="table table-striped" when-scrolled="ctrl.more()" style="width: 100%;">
910
<thead class="thead-dark">
1011
<tr>
1112
<th ng-click="ctrl.ToggleOrder('name')"><b translate lib="web">name</b></th>
12-
<th class="w-150"><b translate lib="web">username</b></th>
13-
<th class="w-150" ng-click="ctrl.ToggleOrder('_created')"><b translate lib="web">created</b></th>
13+
<th ng-click="ctrl.ToggleOrder('username')" class="w-150"><b translate lib="web">username</b></th>
14+
<th ng-click="ctrl.ToggleOrder('_created')" class="w-150"><b translate lib="web">created</b></th>
1415
<th class="w-150"></th>
1516
</tr>
1617
</thead>

‎OpenFlow/src/public/Customers.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<h1 translate lib="web">customers</h1>
33
</div>
44
<div class="col-sm-12 text-right">
5+
<i class="fas fa-cog fa-spin" ng-show="ctrl.loading==true"></i>
56
<a href="#/Customer" class="btn btn-info" translate lib="web"
67
ng-show="menuctrl.hasrole('customer admins') || menuctrl.hasrole('resellers')">addcustomer</a>
78
</div>

‎OpenFlow/src/public/Deleted.html‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ <h1 translate lib="web">deleted entities</h1>
44
</div>
55

66
<div class="row">
7-
<div class="col-md-6">
7+
<div class="col-sm">
88
<div className="btn-group-justified">
99
<div class="btn-group" role="group">
1010
<select ng-model="ctrl.collection" ng-options="item.name as item.name for item in ctrl.collections"
@@ -13,6 +13,11 @@ <h1 translate lib="web">deleted entities</h1>
1313
</div>
1414
</div>
1515
</div>
16+
<div class="col-sm">
17+
</div>
18+
<div class="col-sm text-right">
19+
<i class="fas fa-cog fa-spin" ng-show="ctrl.loading==true"></i>
20+
</div>
1621
</div>
1722

1823
<div ng-show="ctrl.errormessage != ''"" class=" alert alert-danger" role="alert">{{ctrl.errormessage}}</div>

‎OpenFlow/src/public/Duplicates.html‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,21 @@ <h1 translate lib="web">duplicates tracking</h1>
88
<div ng-show="ctrl.errormessage != ''"" class=" alert alert-danger" role="alert">{{ctrl.errormessage}}</div>
99

1010
<div class="form-group form-horizontal">
11-
<label class="sr-only">Uniqeness</label>
12-
<div class="input-group unframed-addons col-sm-9 ">
13-
<input ng-model="ctrl.uniqeness" ng-change="ctrl.loadData()" class="form-control input-md"
14-
ng-model-options="{debounce: 400}" placeholder="group by fields seperated by comma" />
15-
<p class="col-md-1 lead"></p>
16-
<div class="text-right">
17-
<button class="btn btn-info" ng-disabled="ctrl.loading==true" ng-click="ctrl.MassDeleteOnlyOne()"><em
18-
class="fas fa-trash"></em> one</button>
19-
<button class="btn btn-info" ng-disabled="ctrl.loading==true" ng-click="ctrl.MassDeleteAllButOne()"><em
20-
class="fas fa-trash"></em> all but one</button>
21-
<button class="btn btn-info" ng-disabled="ctrl.loading==true" ng-click="ctrl.MassDeleteAll()"><em
22-
class="fas fa-trash"></em> all</button>
11+
<div class="col-sm">
12+
<label class="sr-only">Uniqeness</label>
13+
<div class="input-group unframed-addons">
14+
<input ng-model="ctrl.uniqeness" ng-change="ctrl.loadData()" class="form-control input-md"
15+
ng-model-options="{debounce: 400}" placeholder="group by fields seperated by comma" />
16+
<p class="col-md-1 lead"></p>
17+
<div class="text-right">
18+
<i class="fas fa-cog fa-spin" ng-show="ctrl.loading==true"></i>
19+
<button class="btn btn-info" ng-disabled="ctrl.loading==true" ng-click="ctrl.MassDeleteOnlyOne()"><em
20+
class="fas fa-trash"></em> one</button>
21+
<button class="btn btn-info" ng-disabled="ctrl.loading==true" ng-click="ctrl.MassDeleteAllButOne()"><em
22+
class="fas fa-trash"></em> all but one</button>
23+
<button class="btn btn-info" ng-disabled="ctrl.loading==true" ng-click="ctrl.MassDeleteAll()"><em
24+
class="fas fa-trash"></em> all</button>
25+
</div>
2326
</div>
2427
</div>
2528
</div>

‎OpenFlow/src/public/EntityRestrictions.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<h1 translate lib="web">entity restrictions</h1>
33
</div>
44
<div class="col-sm-12 text-right">
5+
<i class="fas fa-cog fa-spin" ng-show="ctrl.loading==true"></i>
56
<a class="btn btn-info" ng-click="ctrl.EnsureCommon()" translate lib="web"
67
ng-show="menuctrl.hasrole('admins')">ensurecommon</a>
78
<a href="#/EntityRestriction" class="btn btn-info" translate lib="web">addEntityRestriction</a>

‎OpenFlow/src/public/Files.html‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
1-
<div class="row">
2-
<h1 translate lib="web">files</h1>
1+
<div class="row" id="title">
2+
<div class="col-sm">
3+
<h1 translate lib="web">files</h1>
4+
</div>
5+
<div class="col-sm"></div>
6+
<div class="col-sm text-right">
7+
<i class="fas fa-cog fa-spin" ng-show="ctrl.loading==true"></i>
8+
</div>
39
</div>
10+
411
<style>
512
#myProgress {
613
width: 100%;

‎OpenFlow/src/public/Forms.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<h1 translate lib="web">forms</h1>
33
</div>
44
<div class="col-sm-12 text-right">
5+
<i class="fas fa-cog fa-spin" ng-show="ctrl.loading==true"></i>
56
<a ng-href="#/EditForm" class="btn btn-info" translate lib="web">addform</a>
67
</div>
78
<div ng-show="ctrl.errormessage != ''" class=" alert alert-danger" role="alert">{{ctrl.errormessage}}</div>

0 commit comments

Comments
 (0)