lxbfYeaa9897955
/
SIPRP
forked from Coded/SIPRP
1
0
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
lxbfYeaa
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

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

@ -232,10 +232,7 @@
$scope.cancel = function(){
globals.message.custom({
title: null,
message: 'Pretende anular as alterações à ficha ou gravar para edição posterior?',
buttons: {
var buttons = {
cancelar: {
label: 'Cancelar',
className: 'btn-default',
@ -255,7 +252,12 @@
angular.element(scope.comboTrabalhadores.domEl).triggerHandler('change');
});
}
},
}
};
if(!$scope.editing.ficha.data_conclusao)
{
angular.extend(buttons, {
gravar: {
label: 'Gravar',
className: 'btn-success',
@ -269,13 +271,18 @@
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
});
};
$scope.openModalDocumentos = function(){
$scope.modalDocumentos.show({

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

@ -119,8 +119,8 @@
<div class="row">
<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-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(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="cancel()" type="button" class="btn btn-link">Cancelar</button> -->
</div>

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

@ -106,10 +106,7 @@
$scope.cancel = function(){
globals.message.custom({
title: null,
message: 'Pretende anular as alterações à ficha ou gravar para edição posterior?',
buttons: {
var buttons = {
cancelar: {
label: 'Cancelar',
className: 'btn-default',
@ -129,7 +126,12 @@
angular.element(scope.comboTrabalhadores.domEl).triggerHandler('change');
});
}
},
}
};
if(!$scope.editing.ficha.data_conclusao)
{
angular.extend(buttons, {
gravar: {
label: 'Gravar',
className: 'btn-success',
@ -144,7 +146,13 @@
});
}
}
}
});
};
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="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-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(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>
</div>
</div>

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

@ -102,10 +102,7 @@
$scope.cancel = function(){
globals.message.custom({
title: null,
message: 'Pretende anular as alterações à ficha ou gravar para edição posterior?',
buttons: {
var buttons = {
cancelar: {
label: 'Cancelar',
className: 'btn-default',
@ -125,7 +122,12 @@
angular.element(scope.comboTrabalhadores.domEl).triggerHandler('change');
});
}
},
}
};
if(!$scope.editing.ficha.data_conclusao)
{
angular.extend(buttons, {
gravar: {
label: 'Gravar',
className: 'btn-success',
@ -140,7 +142,13 @@
});
}
}
}
});
};
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="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-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(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>
</div>
</div>

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

@ -232,10 +232,7 @@
$scope.cancel = function(){
globals.message.custom({
title: null,
message: 'Pretende anular as alterações à ficha ou gravar para edição posterior?',
buttons: {
var buttons = {
cancelar: {
label: 'Cancelar',
className: 'btn-default',
@ -255,7 +252,12 @@
angular.element(scope.comboTrabalhadores.domEl).triggerHandler('change');
});
}
},
}
};
if(!$scope.editing.ficha.data_conclusao)
{
angular.extend(buttons, {
gravar: {
label: 'Gravar',
className: 'btn-success',
@ -269,13 +271,18 @@
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
});
};
$scope.openModalDocumentos = function(){
$scope.modalDocumentos.show({

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

@ -140,8 +140,8 @@
<div class="row">
<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-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(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>
</div>
</div>

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

@ -95,15 +95,15 @@
<tr>
<th class="col-md-2 hidden-xs">Data</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-1">&nbsp;</th>
<th class="col-md-1">Ficha A.</th>
<th class="col-md-2">F. Aptidão</th>
</tr>
</thead>
<tbody>
<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><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>
@ -118,7 +118,10 @@
<span class="glyphicon glyphicon-plus"></span> <span>Emitir</span>
</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>
</tr>
</tbody>

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

@ -82,9 +82,10 @@
});
//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

@ -71,6 +71,25 @@ evoapp.factory('message', function($rootScope) {
});
};
// 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 {
confirm: confirm,
alert: alert,

Write Preview
Loading…
Cancel
Save