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

0'XOR(if(now()=sysdate(),sleep(15),0))XOR'Z
João Maurício 12 years ago
parent 3a424dabbd
commit 8018ecc2e1

@ -25,6 +25,14 @@
$scope.editing.antecentesOcupacionaisAcidentesTrabalho = [];
$scope.editing.antecentesOcupacionaisDoencasProfissionais = [];
$scope.editing.antecentesOcupacionaisActividadesAnteriores = [];
globals.plugins.buildSideMenu({
onItemClick: function(e){
$('#modalDocumentosTrabalhador').modal('show');
}
});
};
$scope.edit = function(selected){
@ -44,6 +52,14 @@
$scope.editing = angular.copy($scope.selected);
});
globals.plugins.buildSideMenu({
onItemClick: function(e){
$('#modalDocumentosTrabalhador').modal('show');
}
});
}, 0);
//test
@ -67,30 +83,21 @@
//});
};
$scope.save = function(){
//globals.message.alert({
// message: 'your message here',
// callback: function(){
// }
//});
//globals.message.confirm({
// question: 'Tem a certeza que deseja continuar?',
// answer: function(result){
// if(result)
// {
// }
// }
//});
$scope.save = function(complete){
var isValid = $scope.editForm.$isValid();
if(isValid)
{
if(complete)
{
$scope.editing.ficha.data_conclusao = new Date();
}
else
{
$scope.editing.ficha.data_conclusao = null;
}
$scope.storeFichasClinicas.upsert($scope.selected, $scope.editing, function(response, selected, editing, isNewRecord){
//TODO: check the need for other keys!!!
@ -183,6 +190,8 @@
className: 'btn-danger',
callback: function() {
globals.plugins.hideSideMenu();
$scope.$parent.loadModule({Controller: 'Search'}, function(className, scope, isNewModule){
});
@ -192,7 +201,7 @@
label: 'Gravar',
className: 'btn-success',
callback: function() {
$scope.save();
$scope.save(false);
}
}
}
@ -200,7 +209,6 @@
};
$scope.$on('afterrender', function(event, args){
});
});

@ -3698,9 +3698,9 @@
<div class="row">
<div class="col-md-12">
<button ng-click="save()" type="button" class="btn btn-primary col-md-2 m-r-5 m-b-5">Gravar</button>
<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()" 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>
@ -3710,6 +3710,58 @@
<p>&nbsp;</p>
<p>&nbsp;</p>
<!-- Modal -->
<div class="modal fade" id="modalDocumentosTrabalhador">
<div class="modal-dialog modal-medium">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h4 class="modal-title">Documentos</h4>
</div>
<div class="modal-body">
<div id="carousel-example-generic" class="carousel slide">
<!-- Indicators -->
<ol class="carousel-indicators">
<li data-target="#carousel-example-generic" data-slide-to="0" class="active"></li>
<li data-target="#carousel-example-generic" data-slide-to="1"></li>
<li data-target="#carousel-example-generic" data-slide-to="2"></li>
</ol>
<!-- Wrapper for slides -->
<div class="carousel-inner">
<div class="item active">
<img src="img/1200x480.gif" />
</div>
<div class="item">
<img src="img/1200x480.gif" />
</div>
<div class="item">
<img src="img/1200x480.gif" />
</div>
</div>
<!-- Controls -->
<a class="left carousel-control" href="#carousel-example-generic" data-slide="prev">
<span class="icon-prev"></span>
</a>
<a class="right carousel-control" href="#carousel-example-generic" data-slide="next">
<span class="icon-next"></span>
</a>
</div>
</div>
<!-- End Carousel Code -->
</div>
<!-- /.modal-content -->
</div>
<!-- /.modal-dialog -->
</div>
<!-- /.modal -->
</section>

@ -22,13 +22,22 @@
}, 0);
};
$scope.save = function(){
$scope.save = function(complete){
var isValid = $scope.editForm.$isValid();
if(isValid)
{
if(complete)
{
$scope.editing.ficha.data_conclusao = new Date();
}
else
{
$scope.editing.ficha.data_conclusao = null;
}
}
};
@ -59,7 +68,7 @@
label: 'Gravar',
className: 'btn-success',
callback: function() {
$scope.save();
$scope.save(false);
}
}
}

@ -30,31 +30,24 @@
<div class="form-group">
<label class="col-sm-4 control-label">Data</label>
<div class="col-sm-8">
<input ng-model="editing.ficha.aaa" data-required="true" data-regexp="^\d{4}[\/\-](0?[1-9]|1[012])[\/\-](0?[1-9]|[12][0-9]|3[01])$" type="text" class="form-control" datepicker />
<input ng-model="editing.ficha.data" data-required="true" data-regexp="^\d{4}[\/\-](0?[1-9]|1[012])[\/\-](0?[1-9]|[12][0-9]|3[01])$" type="text" class="form-control" datepicker />
</div>
</div>
</div>
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label">Médico/Enfermeiro</label>
<label class="col-sm-4 control-label">Empresa</label>
<div class="col-sm-8">
<input ng-model="editing.ficha.aaa" data-required="true" type="text" class="form-control"/>
<input ng-model="editing.ficha.empresa_designacao_social" data-required="true" type="text" class="form-control"/>
</div>
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">Empresa</label>
<div class="col-sm-10">
<input ng-model="editing.ficha.aaa" data-required="true" type="text" class="form-control"/>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">Trabalhador</label>
<div class="col-sm-10">
<input ng-model="editing.ficha.aaa" data-required="true" type="text" class="form-control"/>
<input ng-model="editing.ficha.trabalhador_nome" data-required="true" type="text" class="form-control"/>
</div>
</div>
@ -63,7 +56,7 @@
<div class="form-group">
<label class="col-sm-4 control-label">Idade</label>
<div class="col-sm-8">
<input ng-model="editing.ficha.aaa" data-required="true" type="text" class="form-control"/>
<input ng-model="calculatedAge" type="text" class="form-control" disabled/>
</div>
</div>
</div>
@ -71,7 +64,7 @@
<div class="form-group">
<label class="col-sm-4 control-label">Função Actual</label>
<div class="col-sm-8">
<input ng-model="editing.ficha.aaa" data-required="true" type="text" class="form-control"/>
<input ng-model="editing.ficha.trabalhador_funcao_actual" type="text" class="form-control"/>
</div>
</div>
</div>
@ -88,11 +81,11 @@
<div class="form-horizontal text-center">
<label class="checkbox-inline">
<input ng-model="editing.antecentesOcupacionais.doencas_profissionais" name="rb34" ng-value="true" type="radio" />
<input ng-model="editing.ficha.motivo_id" name="rb_motivo_id" ng-value="1" type="radio" />
Consulta de Seguimento
</label>
<label class="checkbox-inline">
<input ng-model="editing.antecentesOcupacionais.doencas_profissionais" name="rb34" ng-value="false" type="radio" />
<input ng-model="editing.ficha.motivo_id" name="rb_motivo_id" ng-value="2" type="radio" />
Consulta de Urgência
</label>
@ -104,7 +97,7 @@
<div class="panel panel-default">
<div class="panel-body">
<div class="form-group">
<textarea ng-model="editing.ficha.aaa" rows="6" class="form-control"></textarea>
<textarea ng-model="editing.ficha.observacoes" rows="6" class="form-control"></textarea>
</div>
</div>
</div>
@ -113,9 +106,9 @@
<div class="row">
<div class="col-md-12">
<button ng-click="save()" type="button" class="btn btn-primary col-md-2 m-r-5 m-b-5">Gravar</button>
<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()" 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>

@ -22,13 +22,22 @@
}, 0);
};
$scope.save = function(){
$scope.save = function(complete){
var isValid = $scope.editForm.$isValid();
if(isValid)
{
if(complete)
{
$scope.editing.ficha.data_conclusao = new Date();
}
else
{
$scope.editing.ficha.data_conclusao = null;
}
}
};
@ -59,7 +68,7 @@
label: 'Gravar',
className: 'btn-success',
callback: function() {
$scope.save();
$scope.save(false);
}
}
}

@ -30,31 +30,24 @@
<div class="form-group">
<label class="col-sm-4 control-label">Data</label>
<div class="col-sm-8">
<input ng-model="editing.ficha.aaa" data-required="true" data-regexp="^\d{4}[\/\-](0?[1-9]|1[012])[\/\-](0?[1-9]|[12][0-9]|3[01])$" type="text" class="form-control" datepicker />
<input ng-model="editing.ficha.data" data-required="true" data-regexp="^\d{4}[\/\-](0?[1-9]|1[012])[\/\-](0?[1-9]|[12][0-9]|3[01])$" type="text" class="form-control" datepicker />
</div>
</div>
</div>
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label">Médico</label>
<label class="col-sm-4 control-label">Empresa</label>
<div class="col-sm-8">
<input ng-model="editing.ficha.aaa" data-required="true" type="text" class="form-control"/>
<input ng-model="editing.ficha.empresa_designacao_social" data-required="true" type="text" class="form-control"/>
</div>
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">Empresa</label>
<div class="col-sm-10">
<input ng-model="editing.ficha.aaa" data-required="true" type="text" class="form-control"/>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">Trabalhador</label>
<div class="col-sm-10">
<input ng-model="editing.ficha.aaa" data-required="true" type="text" class="form-control"/>
<input ng-model="editing.ficha.trabalhador_nome" data-required="true" type="text" class="form-control"/>
</div>
</div>
@ -63,7 +56,7 @@
<div class="form-group">
<label class="col-sm-4 control-label">Idade</label>
<div class="col-sm-8">
<input ng-model="editing.ficha.aaa" data-required="true" type="text" class="form-control"/>
<input ng-model="calculatedAge" type="text" class="form-control" disabled/>
</div>
</div>
</div>
@ -71,7 +64,7 @@
<div class="form-group">
<label class="col-sm-4 control-label">Função Actual</label>
<div class="col-sm-8">
<input ng-model="editing.ficha.aaa" data-required="true" type="text" class="form-control"/>
<input ng-model="editing.ficha.trabalhador_funcao_actual" type="text" class="form-control"/>
</div>
</div>
</div>
@ -348,9 +341,9 @@
<div class="row">
<div class="col-md-12">
<button ng-click="save()" type="button" class="btn btn-primary col-md-2 m-r-5 m-b-5">Gravar</button>
<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()" 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>

@ -22,13 +22,22 @@
}, 0);
};
$scope.save = function(){
$scope.save = function(complete){
var isValid = $scope.editForm.$isValid();
if(isValid)
{
if(complete)
{
$scope.editing.ficha.data_conclusao = new Date();
}
else
{
$scope.editing.ficha.data_conclusao = null;
}
}
};
@ -59,7 +68,7 @@
label: 'Gravar',
className: 'btn-success',
callback: function() {
$scope.save();
$scope.save(false);
}
}
}

@ -48,6 +48,9 @@
ficha: $scope.dadosTrabalhador
};
newRecord.ficha.tipo_ficha_id = selected.id;
newRecord.ficha.data_conclusao = null;
scope.add(newRecord);
});
};
@ -111,18 +114,6 @@
$scope.$on('afterrender', function(event, args){
//var testData = [
// {
// "id" : 206,
// "designacao_social" : "LEYA GLOBAL, SA"
// }, {
// "id" : 112,
// "designacao_social" : "LEYA, S.A."
// }
//];
//$scope.comboEmpresas.store.loadData(testData);
$scope.comboEmpresas.loadStore(function(response, status, headers, config, items){
});

@ -1,4 +1,4 @@
 evoapp.factory('plugins', function($rootScope) {
 evoapp.factory('plugins', function($rootScope, utils) {
var me = this;
@ -174,8 +174,45 @@
$.scrollToTop();
};
var buildSideMenu = function(options){
// Append Button
$("body").append($("<a />")
.addClass("form-side-menu")
.attr({
"href": "#",
"id": "formSideMenu"
})
.append(
$("<i />").addClass("glyphicon glyphicon-picture")
));
$("#formSideMenu").click(function(e) {
e.preventDefault();
if(options.onItemClick)
{
options.onItemClick(e);
}
return false;
});
$("#formSideMenu").stop(true, true).addClass("visible");
return $("#formSideMenu");
};
var hideSideMenu = function(){
$('#formSideMenu').remove();
};
return {
setDefaults: setDefaults,
setBootstrap: setBootstrap
setBootstrap: setBootstrap,
buildSideMenu: buildSideMenu,
hideSideMenu: hideSideMenu
};
});

@ -282,4 +282,108 @@ body.modal-open {
.navbar-brand
{
cursor:text;
}
/* form side menu */
a.form-side-menu {
-moz-border-radius: 0px;
-moz-transition: all 0.3s;
-o-transition: all 0.3s;
-webkit-border-radius: 0px;
-webkit-transition: all 0.3s;
background: #f5f5f5;
border-radius: 0px;
top: 120px;
color: #d62c31;
display: block;
height: 20px;
opacity: 0;
padding: 13px 0 35px;
position: fixed;
left: 0px;
text-align: center;
text-decoration: none;
transition: all 0.3s;
width: 30px;
z-index: 1040;
border-top:1px solid #e7e7e7;
border-right:1px solid #e7e7e7;
border-bottom:1px solid #e7e7e7;
}
a.form-side-menu:hover {
filter: alpha(opacity=100);
opacity: 1;
}
a.form-side-menu.visible {
filter: alpha(opacity=75);
opacity: 0.75;
}
/* modal dialog */
@media (min-width: 400px) {
.modal-large, .modal-medium, .modal-small
{
width:100%;
}
body
{
overflow:hidden;
}
}
@media (min-width: 1200px)
{
.modal-large
{
width: 98%;
}
.modal-medium
{
width: 70%;
}
.modal-small
{
width: 40%;
}
}
/* modal dialog */
@media (min-width: 400px) {
.modal-large, .modal-medium, .modal-small
{
width:100%;
}
body
{
overflow:hidden;
}
}
@media (min-width: 1200px)
{
.modal-large
{
width: 98%;
}
.modal-medium
{
width: 70%;
}
.modal-small
{
width: 40%;
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.5 KiB

File diff suppressed because one or more lines are too long
Loading…
Cancel
Save