Commit 19e323e7 by german callejas

Vista admin modificada

parent 33940b5d
...@@ -355,6 +355,7 @@ ...@@ -355,6 +355,7 @@
"reports": "Reports", "reports": "Reports",
"request_change_password": "Request change password", "request_change_password": "Request change password",
"resume": "Resume", "resume": "Resume",
"role": "Role",
"room_changed": "A partner is offline. Session paused.", "room_changed": "A partner is offline. Session paused.",
"save": "Save", "save": "Save",
"save_as_template": "Save as template", "save_as_template": "Save as template",
......
...@@ -353,6 +353,7 @@ ...@@ -353,6 +353,7 @@
"reports": "Informes", "reports": "Informes",
"request_change_password": "Solicitar cambio de contraseña", "request_change_password": "Solicitar cambio de contraseña",
"resume": "Continuar", "resume": "Continuar",
"role": "Rol",
"room_changed":"Un participante abandonó la sesión. Sesión en pausa.", "room_changed":"Un participante abandonó la sesión. Sesión en pausa.",
"save": "Guardar", "save": "Guardar",
"save_as_template": "Guardar como plantilla", "save_as_template": "Guardar como plantilla",
......
...@@ -37,7 +37,7 @@ dashboardControllers.controller('AdminSupervisorsCtrl', function AdminSupervisor ...@@ -37,7 +37,7 @@ dashboardControllers.controller('AdminSupervisorsCtrl', function AdminSupervisor
}); });
// List of offices (for the select form) // List of offices (for the select form)
$http /*$http
.get(config.backend+'/office/get_all') .get(config.backend+'/office/get_all')
.success(function(data, status, headers, config) { .success(function(data, status, headers, config) {
$scope.offices = data; $scope.offices = data;
...@@ -46,7 +46,7 @@ dashboardControllers.controller('AdminSupervisorsCtrl', function AdminSupervisor ...@@ -46,7 +46,7 @@ dashboardControllers.controller('AdminSupervisorsCtrl', function AdminSupervisor
$translate('error_downloading_offices').then(function (translation) { $translate('error_downloading_offices').then(function (translation) {
ngToast.danger({ content: translation }); ngToast.danger({ content: translation });
}); });
}); });*/
// Reset form Supervisor // Reset form Supervisor
$scope.resetForm = function(){ $scope.resetForm = function(){
......
...@@ -8,9 +8,9 @@ ...@@ -8,9 +8,9 @@
<li role="presentation" ng-click="selectedTab = 'licenses'" ng-class="{'active':selectedTab === 'licenses'}"> <li role="presentation" ng-click="selectedTab = 'licenses'" ng-class="{'active':selectedTab === 'licenses'}">
<a href="/app/#/admin/licenses">{{ 'licenses' | translate }}</a> <a href="/app/#/admin/licenses">{{ 'licenses' | translate }}</a>
</li> </li>
<li role="presentation" ng-click="selectedTab = 'offices'" ng-class="{'active':selectedTab === 'offices'}"> <!--<li role="presentation" ng-click="selectedTab = 'offices'" ng-class="{'active':selectedTab === 'offices'}">
<a href="/app/#/admin/offices">{{ 'offices' | translate }}</a> <a href="/app/#/admin/offices">{{ 'offices' | translate }}</a>
</li> </li>-->
<li role="presentation" ng-click="selectedTab = 'supervisors'" ng-class="{'active':selectedTab === 'supervisors'}"> <li role="presentation" ng-click="selectedTab = 'supervisors'" ng-class="{'active':selectedTab === 'supervisors'}">
<a href="/app/#/admin/supervisors">{{ 'supervisors' | translate }}</a> <a href="/app/#/admin/supervisors">{{ 'supervisors' | translate }}</a>
</li> </li>
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<div class="col-xs-3"> <div class="col-xs-3">
<a ng-click="resetForm(); hidesupervisoradd = false" class="btn btn-success btn-sm" role="button"> <a ng-click="resetForm(); hidesupervisoradd = false" class="btn btn-success btn-sm" role="button">
<span class="glyphicon glyphicon-plus" aria-hidden="true"></span> {{ 'add_supervisor' | translate }} <span class="glyphicon glyphicon-plus" aria-hidden="true"></span> {{ 'add_supervisor' | translate }}
</a> </a>
</div> </div>
<div class="col-xs-6 input-group"> <div class="col-xs-6 input-group">
<input type="text" ng-model="search_sups" id="search_sups" placeholder="{{ 'filter' | translate }}" class="form-control" aria-describedby="basic-addon2"> <input type="text" ng-model="search_sups" id="search_sups" placeholder="{{ 'filter' | translate }}" class="form-control" aria-describedby="basic-addon2">
...@@ -18,16 +18,18 @@ ...@@ -18,16 +18,18 @@
<div class="col-xs-3"> <div class="col-xs-3">
</div> </div>
</div> </div>
<br>
<table class="table table-striped"> <table class="table table-striped">
<tr> <tr>
<th translate>name</th> <th translate>name</th>
<th translate>email</th> <th translate>email</th>
<th translate>role</th>
<th>Ops</th> <th>Ops</th>
</tr> </tr>
<tr ng-repeat="supervisor in supervisors | filter:search_sups | orderBy: 'name'"> <tr ng-repeat="supervisor in supervisors | filter:search_sups | orderBy: 'name'">
<td class="color_blue">{{supervisor.name}} {{supervisor.surname}}</td> <td class="color_blue">{{supervisor.name}} {{supervisor.surname}}</td>
<td>{{supervisor.email}}</td> <td>{{supervisor.email}}</td>
<td>{{supervisor.role | translate}}</td>
<td class="ops"> <td class="ops">
<a ng-click="update_supervisor(supervisor)" title="{{'edit'|translate}}"><span class="glyphicon glyphicon-pencil" aria-hidden="true"></span></a> <a ng-click="update_supervisor(supervisor)" title="{{'edit'|translate}}"><span class="glyphicon glyphicon-pencil" aria-hidden="true"></span></a>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment