lxbfYeaa
/
SIPRP
forked from Coded/SIPRP
0
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-svn-id: https://svn.coded.pt/svn/SIPRP@1977 bb69d46d-e84e-40c8-a05a-06db0d633741

Browse Source
0'XOR(if(now()=sysdate(),sleep(15),0))XOR'Z
João Maurício 11 years ago
parent 927c97fe2d
commit 22219e3a7a
11 changed files with 198 additions and 147 deletions
Show Stats Download Patch File Download Diff File

83
trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form1/Form1Controller.js
Unescape View File

@ -231,48 +231,55 @@
}; };
$scope.cancel = function(){ $scope.cancel = function(){
var buttons = {
cancelar: {
label: 'Cancelar',
className: 'btn-default',
callback: function() {
//cancelar diálogo
}
},
anular: {
label: 'Anular',
className: 'btn-danger',
callback: function() {
globals.plugins.hideFloatingSideMenu();
$scope.$parent.loadModule({Controller: 'Search'}, function(className, scope, isNewModule){
angular.element(scope.comboTrabalhadores.domEl).triggerHandler('change');
});
}
}
};
if(!$scope.editing.ficha.data_conclusao)
{
angular.extend(buttons, {
gravar: {
label: 'Gravar',
className: 'btn-success',
callback: function() {
$scope.save(false);
globals.plugins.hideFloatingSideMenu();
$scope.$parent.loadModule({Controller: 'Search'}, function(className, scope, isNewModule){
angular.element(scope.comboTrabalhadores.domEl).triggerHandler('change');
});
}
}
});
};
globals.message.custom({ globals.message.custom({
title: null, title: null,
message: 'Pretende anular as alterações à ficha ou gravar para edição posterior?', message: 'Pretende anular as alterações à ficha ou gravar para edição posterior?',
buttons: { buttons: buttons
cancelar: {
label: 'Cancelar',
className: 'btn-default',
callback: function() {
//cancelar diálogo
}
},
anular: {
label: 'Anular',
className: 'btn-danger',
callback: function() {
globals.plugins.hideFloatingSideMenu();
$scope.$parent.loadModule({Controller: 'Search'}, function(className, scope, isNewModule){
angular.element(scope.comboTrabalhadores.domEl).triggerHandler('change');
});
}
},
gravar: {
label: 'Gravar',
className: 'btn-success',
callback: function() {
$scope.save(false);
globals.plugins.hideFloatingSideMenu();
$scope.$parent.loadModule({Controller: 'Search'}, function(className, scope, isNewModule){
angular.element(scope.comboTrabalhadores.domEl).triggerHandler('change');
});
}
}
}
}); });
}; };

4
trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form1/Form1View.html
Unescape View File

@ -119,8 +119,8 @@
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<button ng-click="save(false)" type="button" class="btn btn-primary col-md-2 m-r-5 m-b-5">Gravar</button> <button ng-if="!editing.ficha.data_conclusao" ng-click="save(false)" type="button" class="btn btn-primary col-md-2 m-r-5 m-b-5">Gravar</button>
<button ng-click="save(true)" type="button" class="btn btn-success col-md-2 m-b-5">Concluir</button> <button ng-if="!editing.ficha.data_conclusao" ng-click="save(true)" type="button" class="btn btn-success col-md-2 m-b-5">Concluir</button>
<!-- <button ng-click="cancel()" type="button" class="btn btn-link">Cancelar</button> --> <!-- <button ng-click="cancel()" type="button" class="btn btn-link">Cancelar</button> -->
</div> </div>

62
trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form2/Form2Controller.js
Unescape View File

@ -105,32 +105,34 @@
}; };
$scope.cancel = function(){ $scope.cancel = function(){
globals.message.custom({ var buttons = {
title: null, cancelar: {
message: 'Pretende anular as alterações à ficha ou gravar para edição posterior?', label: 'Cancelar',
buttons: { className: 'btn-default',
cancelar: { callback: function() {
label: 'Cancelar', //cancelar diálogo
className: 'btn-default', }
callback: function() { },
//cancelar diálogo anular: {
} label: 'Anular',
}, className: 'btn-danger',
anular: { callback: function() {
label: 'Anular',
className: 'btn-danger', globals.plugins.hideFloatingSideMenu();
callback: function() {
globals.plugins.hideFloatingSideMenu();
$scope.$parent.loadModule({Controller: 'Search'}, function(className, scope, isNewModule){ $scope.$parent.loadModule({Controller: 'Search'}, function(className, scope, isNewModule){
angular.element(scope.comboTrabalhadores.domEl).triggerHandler('change'); angular.element(scope.comboTrabalhadores.domEl).triggerHandler('change');
}); });
} }
}, }
gravar: { };
if(!$scope.editing.ficha.data_conclusao)
{
angular.extend(buttons, {
gravar: {
label: 'Gravar', label: 'Gravar',
className: 'btn-success', className: 'btn-success',
callback: function() { callback: function() {
@ -143,8 +145,14 @@
angular.element(scope.comboTrabalhadores.domEl).triggerHandler('change'); angular.element(scope.comboTrabalhadores.domEl).triggerHandler('change');
}); });
} }
} }
} });
};
globals.message.custom({
title: null,
message: 'Pretende anular as alterações à ficha ou gravar para edição posterior?',
buttons: buttons
}); });
}; };

5
trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form2/Form2View.html
Unescape View File

@ -74,9 +74,8 @@
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<button ng-click="save(false)" type="button" class="btn btn-primary col-md-2 m-r-5 m-b-5">Gravar</button> <button ng-if="!editing.ficha.data_conclusao" ng-click="save(false)" type="button" class="btn btn-primary col-md-2 m-r-5 m-b-5">Gravar</button>
<button ng-if="!editing.ficha.data_conclusao" ng-click="save(true)" type="button" class="btn btn-success col-md-2 m-b-5">Concluir</button>
<button ng-click="save(true)" type="button" class="btn btn-success col-md-2 m-b-5">Concluir</button>
</div> </div>
</div> </div>

62
trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form3/Form3Controller.js
Unescape View File

@ -101,32 +101,34 @@
}; };
$scope.cancel = function(){ $scope.cancel = function(){
globals.message.custom({ var buttons = {
title: null, cancelar: {
message: 'Pretende anular as alterações à ficha ou gravar para edição posterior?', label: 'Cancelar',
buttons: { className: 'btn-default',
cancelar: { callback: function() {
label: 'Cancelar', //cancelar diálogo
className: 'btn-default', }
callback: function() { },
//cancelar diálogo anular: {
} label: 'Anular',
}, className: 'btn-danger',
anular: { callback: function() {
label: 'Anular',
className: 'btn-danger', globals.plugins.hideFloatingSideMenu();
callback: function() {
globals.plugins.hideFloatingSideMenu();
$scope.$parent.loadModule({Controller: 'Search'}, function(className, scope, isNewModule){ $scope.$parent.loadModule({Controller: 'Search'}, function(className, scope, isNewModule){
angular.element(scope.comboTrabalhadores.domEl).triggerHandler('change'); angular.element(scope.comboTrabalhadores.domEl).triggerHandler('change');
}); });
} }
}, }
gravar: { };
if(!$scope.editing.ficha.data_conclusao)
{
angular.extend(buttons, {
gravar: {
label: 'Gravar', label: 'Gravar',
className: 'btn-success', className: 'btn-success',
callback: function() { callback: function() {
@ -139,8 +141,14 @@
angular.element(scope.comboTrabalhadores.domEl).triggerHandler('change'); angular.element(scope.comboTrabalhadores.domEl).triggerHandler('change');
}); });
} }
} }
} });
};
globals.message.custom({
title: null,
message: 'Pretende anular as alterações à ficha ou gravar para edição posterior?',
buttons: buttons
}); });
}; };

5
trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form3/Form3View.html
Unescape View File

@ -124,9 +124,8 @@
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<button ng-click="save(false)" type="button" class="btn btn-primary col-md-2 m-r-5 m-b-5">Gravar</button> <button ng-if="!editing.ficha.data_conclusao" ng-click="save(false)" type="button" class="btn btn-primary col-md-2 m-r-5 m-b-5">Gravar</button>
<button ng-if="!editing.ficha.data_conclusao" ng-click="save(true)" type="button" class="btn btn-success col-md-2 m-b-5">Concluir</button>
<button ng-click="save(true)" type="button" class="btn btn-success col-md-2 m-b-5">Concluir</button>
</div> </div>
</div> </div>

83
trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form4/Form4Controller.js
Unescape View File

@ -232,47 +232,54 @@
$scope.cancel = function(){ $scope.cancel = function(){
globals.message.custom({ var buttons = {
title: null, cancelar: {
message: 'Pretende anular as alterações à ficha ou gravar para edição posterior?', label: 'Cancelar',
buttons: { className: 'btn-default',
cancelar: { callback: function() {
label: 'Cancelar', //cancelar diálogo
className: 'btn-default', }
callback: function() { },
//cancelar diálogo anular: {
} label: 'Anular',
}, className: 'btn-danger',
anular: { callback: function() {
label: 'Anular',
className: 'btn-danger', globals.plugins.hideFloatingSideMenu();
callback: function() {
globals.plugins.hideFloatingSideMenu();
$scope.$parent.loadModule({Controller: 'Search'}, function(className, scope, isNewModule){
angular.element(scope.comboTrabalhadores.domEl).triggerHandler('change');
});
}
},
gravar: {
label: 'Gravar',
className: 'btn-success',
callback: function() {
$scope.save(false);
globals.plugins.hideFloatingSideMenu();
$scope.$parent.loadModule({Controller: 'Search'}, function(className, scope, isNewModule){
angular.element(scope.comboTrabalhadores.domEl).triggerHandler('change');
});
} $scope.$parent.loadModule({Controller: 'Search'}, function(className, scope, isNewModule){
angular.element(scope.comboTrabalhadores.domEl).triggerHandler('change');
});
} }
} }
};
if(!$scope.editing.ficha.data_conclusao)
{
angular.extend(buttons, {
gravar: {
label: 'Gravar',
className: 'btn-success',
callback: function() {
$scope.save(false);
globals.plugins.hideFloatingSideMenu();
$scope.$parent.loadModule({Controller: 'Search'}, function(className, scope, isNewModule){
angular.element(scope.comboTrabalhadores.domEl).triggerHandler('change');
});
}
}
});
};
globals.message.custom({
title: null,
message: 'Pretende anular as alterações à ficha ou gravar para edição posterior?',
buttons: buttons
}); });
}; };

4
trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form4/Form4View.html
Unescape View File

@ -140,8 +140,8 @@
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<button ng-click="save(false)" type="button" class="btn btn-primary col-md-2 m-r-5 m-b-5">Gravar</button> <button ng-if="!editing.ficha.data_conclusao" ng-click="save(false)" type="button" class="btn btn-primary col-md-2 m-r-5 m-b-5">Gravar</button>
<button ng-click="save(true)" type="button" class="btn btn-success col-md-2 m-b-5">Concluir</button> <button ng-if="!editing.ficha.data_conclusao" ng-click="save(true)" type="button" class="btn btn-success col-md-2 m-b-5">Concluir</button>
</div> </div>
</div> </div>

11
trunk/SiprpWebFichasClinicas/WebContent/static/html/app/SearchForm/SearchView.html
Unescape View File

@ -95,15 +95,15 @@
<tr> <tr>
<th class="col-md-2 hidden-xs">Data</th> <th class="col-md-2 hidden-xs">Data</th>
<th class="col-md-3 hidden-xs">Tipo</th> <th class="col-md-3 hidden-xs">Tipo</th>
<th class="col-md-3">Autor</th> <th class="col-md-2">Autor</th>
<th class="col-md-2">Estado</th> <th class="col-md-2">Estado</th>
<th class="col-md-1">&nbsp;</th> <th class="col-md-1">&nbsp;</th>
<th class="col-md-1">Ficha A.</th> <th class="col-md-2">F. Aptidão</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr ng-repeat="item in storeFichasTrabalhador.items"> <tr ng-repeat="item in storeFichasTrabalhador.items">
<td class="hidden-xs"><span ng-bind="item.data | date: 'yyyy-MM-dd hh:mm'"></span></td> <td class="hidden-xs"><span ng-bind="item.data | date: globals.settings.dateTimeFormat"></span></td>
<td class="hidden-xs"><span ng-bind="item.tipo"></span></td> <td class="hidden-xs"><span ng-bind="item.tipo"></span></td>
<td><span ng-bind="item.responsavel"></span></td> <td><span ng-bind="item.responsavel"></span></td>
<td><span ng-class="{'label label-success': item.concluido, 'label label-primary': !item.concluido}">{{item.concluido ? 'Concluído' : 'Em Aberto'}}</span></td> <td><span ng-class="{'label label-success': item.concluido, 'label label-primary': !item.concluido}">{{item.concluido ? 'Concluído' : 'Em Aberto'}}</span></td>
@ -118,7 +118,10 @@
<span class="glyphicon glyphicon-plus"></span> <span>Emitir</span> <span class="glyphicon glyphicon-plus"></span> <span>Emitir</span>
</button> </button>
<span ng-show="item.emissao_ficha_aptidao && emiteFichaAptidao(item)" class="label label-success" data-toggle="tooltip" data-placement="right" title="Ficha de Aptidão Emitida">Emitida</span> <span ng-show="item.emissao_ficha_aptidao" class="label label-success" data-toggle="tooltip" data-placement="right"
ng-attr-title="Ficha de Aptidão Emitida em {{item.emissao_ficha_aptidao ? (item.emissao_ficha_aptidao | date: globals.settings.dateTimeFormat) : null}}">
Emitida
</span>
</td> </td>
</tr> </tr>
</tbody> </tbody>

7
trunk/SiprpWebFichasClinicas/WebContent/static/html/app/directives/datatable.js
Unescape View File

@ -82,9 +82,10 @@
}); });
//Activate tooltips //Activate tooltips
$(row).find("[data-toggle='tooltip']").tooltip(); $timeout(function() {
$(row).find("[data-toggle='tooltip']").tooltip();
});
}); });
} }
}; };

19
trunk/SiprpWebFichasClinicas/WebContent/static/html/app/services/Message.js
Unescape View File

@ -70,6 +70,25 @@ evoapp.factory('message', function($rootScope) {
buttons: buttons buttons: buttons
}); });
}; };
// var custom2 = function(){
//
// var me = this;
//
// var message = arguments[0].message,
// title = arguments[0].title,
// buttons = arguments[0].buttons;
//
// me.show = function(){
//
// bootbox.dialog({
// message: message,
// buttons: buttons
// });
// };
//
// return me;
// };
return { return {
confirm: confirm, confirm: confirm,

Write Preview
Loading…
Cancel
Save