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@1860 bb69d46d-e84e-40c8-a05a-06db0d633741

Browse Source
0'XOR(if(now()=sysdate(),sleep(15),0))XOR'Z
João Maurício 12 years ago
parent 92b04e19c8
commit 9bd2a8fb68
5 changed files with 700 additions and 38 deletions
Show Stats Download Patch File Download Diff File

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

@ -4,15 +4,13 @@
$scope.calculatedAge = 0; $scope.calculatedAge = 0;
$scope.storeDisciplines = new globals.dataService.store({ $scope.storeFichasClinicas = new globals.dataService.store({
model: 'Discipline', model: null,
actions: { actions: {
get: 'GetDisciplines', get: 'getFichaEAdmissaoInicial',
upsert: 'UpsertDiscipline', upsert: 'upsertFichaEAdmissaoInicial',
destroy: 'DeleteDiscipline' destroy: 'deleteFichaEAdmissaoInicial'
}, }
sort: 'Name',
limit: 8
}); });
$scope.add = function(){ $scope.add = function(){
@ -27,6 +25,13 @@
$scope.edit = function(selected){ $scope.edit = function(selected){
$scope.storeFichasClinicas.get(function(response, status, headers, config, items){
$scope.selected = items;
$scope.editing = angular.copy($scope.selected);
});
//test //test
var testModel = { var testModel = {
@ -637,24 +642,24 @@
}; };
//test //test
selected = testModel; //selected = testModel;
//$scope.editForm.$reset(); //$scope.editForm.$reset();
$scope.selected = selected; //$scope.selected = selected;
$scope.editing = angular.copy(selected); //$scope.editing = angular.copy(selected);
//listeners //listeners
$scope.$watch('editing.ficha.trabalhador_data_nascimento', function(newVal, oldVal){ //$scope.$watch('editing.ficha.trabalhador_data_nascimento', function(newVal, oldVal){
if(newVal != null && newVal != oldVal) // if(newVal != null && newVal != oldVal)
{ // {
var a = moment(new Date()); // var a = moment(new Date());
var b = moment(newVal); // var b = moment(newVal);
$scope.calculatedAge = a.diff(b, 'years'); // $scope.calculatedAge = a.diff(b, 'years');
} // }
}); //});
}; };
$scope.save = function(){ $scope.save = function(){

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

@ -245,7 +245,7 @@
<div class="form-group"> <div class="form-group">
<label class="col-sm-4 control-label">Data de Admissão na Empresa</label> <label class="col-sm-4 control-label">Data de Admissão na Empresa</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input ng-model="editing.ficha.trabalhador_data_admissao" value="{{editing.ficha.trabalhador_data_nascimento}}" data-required="true" data-regexp="^(0?[1-9]|[12][0-9]|3[01])[\/\-](0?[1-9]|1[012])[\/\-]\d{4}$" type="text" class="form-control" datepicker /> <input ng-model="editing.ficha.trabalhador_data_admissao" value="{{editing.ficha.trabalhador_data_admissao}}" data-required="true" data-regexp="^(0?[1-9]|[12][0-9]|3[01])[\/\-](0?[1-9]|1[012])[\/\-]\d{4}$" type="text" class="form-control" datepicker />
</div> </div>
</div> </div>
</div> </div>

663
trunk/SiprpWebFichasClinicas/WebContent/static/html/app/Form1/test.html
Unescape View File

@ -0,0 +1,663 @@
<h4 class="section-title" id="H2">4 - Antecedentes Pessoais</h4>
<div class="panel panel-default">
<div class="panel-body">
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="control-label">4.1 - Doenças Infecciosas</label>
<div class="checkbox">
<label>
<input ng-model="editing.doencasActivas.doencas_infecciosas_tuberculose" value="true" type="checkbox" />
Tuberculose
</label>
</div>
<div class="checkbox">
<div class="row">
<div class="col-md-4">
<label>
<input ng-model="editing.doencasActivas.doencas_infecciosas_hepatites" value="true" type="checkbox" />
Hepatites
</label>
</div>
<div class="col-md-8 p-l-none">
<div ng-show="editing.doencasActivas.doencas_infecciosas_hepatites" class="row">
<div class="col-md-2">
<label class="control-label">Tipo</label>
</div>
<div class="col-md-10">
<input ng-model="editing.doencasActivas.doencas_infecciosas_hepatites_detalhe" type="text" class="form-control input-sm" />
</div>
</div>
</div>
</div>
</div>
<div class="checkbox">
<label>
<input ng-model="editing.doencasActivas.doencas_infecciosas_vih" value="true" type="checkbox" />
V.I.H.
</label>
</div>
<div class="checkbox">
<div class="row">
<div class="col-md-4">
<label>
<input ng-model="editing.doencasActivas.doencas_infecciosas_outras" value="true" type="checkbox" />
Outras
</label>
</div>
<div class="col-md-8 p-l-none">
<div ng-show="editing.doencasActivas.doencas_infecciosas_outras" class="row">
<div class="col-md-2">
<label class="control-label">Quais</label>
</div>
<div class="col-md-10">
<textarea ng-model="editing.doencasActivas.doencas_infecciosas_outras_detalhe" rows="3" class="form-control"></textarea>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="control-label">4.2 - Doenças de Nutrição, Metabolismo, Endócrinas e Imunitárias</label>
<div class="checkbox">
<label>
<input ng-model="editing.doencasActivas.doencas_nutricao_diabetes" value="true" type="checkbox" />
Diabetes
</label>
</div>
<div class="checkbox">
<label>
<input ng-model="editing.doencasActivas.doencas_nutricao_obesidade" value="true" type="checkbox" />
Obesidade
</label>
</div>
<div class="checkbox">
<label>
<input ng-model="editing.doencasActivas.doencas_nutricao_mal_nutricao" value="true" type="checkbox" />
Mal nutrição
</label>
</div>
<div class="checkbox">
<label>
<input ng-model="editing.doencasActivas.doencas_nutricao_dislipidemias" value="true" type="checkbox" />
Dislipidémias
</label>
</div>
<div class="checkbox">
<label>
<input ng-model="editing.doencasActivas.doencas_nutricao_imunitarias" value="true" type="checkbox" />
Imunitárias
</label>
</div>
<div class="checkbox">
<label>
<input ng-model="editing.doencasActivas.doencas_nutricao_outras_doencas_metabolismo" value="true" type="checkbox" />
Outras doenças do metabolismo
</label>
</div>
<div class="checkbox">
<label>
<input ng-model="editing.doencasActivas.doencas_nutricao_outras_doencas_endocrinas" value="true" type="checkbox" />
Outras doenças endócrinas
</label>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="panel panel-default">
<div class="panel-body">
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="control-label">4.3 - Neoplasias</label>
<textarea ng-model="editing.doencasActivas.neoplasias_detalhe" rows="3" class="form-control"></textarea>
</div>
<div class="form-group">
<label class="control-label">4.5 - Transtornos Mentais</label>
<div class="checkbox">
<label>
<input ng-model="editing.doencasActivas.transtornos_mentais_neurose" value="true" type="checkbox" />
Neurose
</label>
</div>
<div class="checkbox">
<label>
<input ng-model="editing.doencasActivas.transtornos_mentais_psicose" value="true" type="checkbox" />
Psicose
</label>
</div>
<div class="checkbox">
<label>
<input ng-model="editing.doencasActivas.transtornos_mentais_depressao" value="true" type="checkbox" />
Depressão
</label>
</div>
<div class="checkbox">
<div class="row">
<div class="col-md-4">
<label>
<input ng-model="editing.doencasActivas.transtornos_mentais_outros" value="true" type="checkbox" />
Outros
</label>
</div>
<div class="col-md-8 p-l-none">
<div ng-show="editing.doencasActivas.transtornos_mentais_outros" class="row">
<div class="col-md-2">
<label class="control-label">Quais</label>
</div>
<div class="col-md-10">
<textarea ng-model="editing.doencasActivas.transtornos_mentais_outros_detalhe" rows="3" class="form-control"></textarea>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="form-group">
<label class="control-label">4.7 - Doenças do Aparelho Circulatório</label>
<div class="checkbox">
<label>
<input ng-model="editing.doencasActivas.doencas_circulatorio_hta" value="true" type="checkbox" />
HTA
</label>
</div>
<div class="checkbox">
<label>
<input ng-model="editing.doencasActivas.doencas_circulatorio_isquemica" value="true" type="checkbox" />
Doença Isquémica
</label>
</div>
<div class="checkbox">
<label>
<input ng-model="editing.doencasActivas.doencas_circulatorio_varizes" value="true" type="checkbox" />
Varizes M.I.
</label>
</div>
<div class="checkbox">
<div class="row">
<div class="col-md-4">
<label>
<input ng-model="editing.doencasActivas.doencas_circulatorio_outras" value="true" type="checkbox" />
Outras
</label>
</div>
<div class="col-md-8 p-l-none">
<div ng-show="editing.doencasActivas.doencas_circulatorio_outras" class="row">
<div class="col-md-2">
<label class="control-label">Quais</label>
</div>
<div class="col-md-10">
<textarea ng-model="editing.doencasActivas.doencas_circulatorio_outras_detalhe" rows="3" class="form-control"></textarea>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="form-group">
<label class="control-label">4.9 - Doenças do Aparelho Digestivo</label>
<div class="checkbox">
<label>
<input ng-model="editing.doencasActivas.doencas_digestivo_cavidade_bucal" value="true" type="checkbox" />
Doenças da cavidade bucal
</label>
</div>
<div class="checkbox">
<label>
<input ng-model="editing.doencasActivas.doencas_digestivo_peptica" value="true" type="checkbox" />
Doença péptica
</label>
</div>
<div class="checkbox">
<label>
<input ng-model="editing.doencasActivas.doencas_digestivo_hernias" value="true" type="checkbox" />
Hérnias
</label>
</div>
<div class="checkbox">
<label>
<input ng-model="editing.doencasActivas.doencas_digestivo_hepatica" value="true" type="checkbox" />
Doença Hepática
</label>
</div>
<div class="checkbox">
<div class="row">
<div class="col-md-4">
<label>
<input ng-model="editing.doencasActivas.doencas_digestivo_outras" value="true" type="checkbox" />
Outras doenças do Aparelho Digestivo
</label>
</div>
<div class="col-md-8 p-l-none">
<div ng-show="editing.doencasActivas.doencas_digestivo_outras" class="row">
<div class="col-md-2">
<label class="control-label">Quais</label>
</div>
<div class="col-md-10">
<textarea ng-model="editing.doencasActivas.doencas_digestivo_outras_detalhe" rows="3" class="form-control"></textarea>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="form-group">
<label class="control-label">4.11 - Complicações da Gravidez e Puerpério. </label>
<label class="control-label">Quais?</label>
<textarea ng-model="editing.doencasActivas.complicacoes_gravidez_puerperio_detalhe" rows="3" class="form-control"></textarea>
</div>
<div class="form-group">
<label class="control-label">4.13 - Doenças do S. Osteomuscular e Tecido Conjuntivo</label>
<div class="checkbox">
<label>
<input ng-model="editing.doencasActivas.doencas_osteomuscular_tecido_conjuntivo_espondilartrose" value="true" type="checkbox" />
Espondilartrose
</label>
</div>
<div class="checkbox">
<div class="row">
<div class="col-md-4">
<label>
<input ng-model="editing.doencasActivas.doencas_osteomuscular_tecido_conjuntivo_atroses" value="true" type="checkbox" />
Outras Artroses
</label>
</div>
<div class="col-md-8 p-l-none">
<div ng-show="editing.doencasActivas.doencas_osteomuscular_tecido_conjuntivo_atroses" class="row">
<div class="col-md-2">
<label class="control-label">Quais</label>
</div>
<div class="col-md-10">
<input ng-model="editing.doencasActivas.doencas_osteomuscular_tecido_conjuntivo_atroses_detalhe" type="text" class="form-control" />
</div>
</div>
</div>
</div>
</div>
<div class="checkbox">
<div class="row">
<div class="col-md-4">
<label>
<input ng-model="editing.doencasActivas.doencas_osteomuscular_tecido_conjuntivo_outras" value="true" type="checkbox" />
Outras Doenças do S. OM e Tec. Conjuntivo
</label>
</div>
<div class="col-md-8 p-l-none">
<div ng-show="editing.doencasActivas.doencas_osteomuscular_tecido_conjuntivo_outras" class="row">
<div class="col-md-2">
<label class="control-label">Quais</label>
</div>
<div class="col-md-10">
<textarea ng-model="editing.doencasActivas.doencas_osteomuscular_tecido_conjuntivo_outras_detalhe" rows="3" class="form-control"></textarea>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="form-group">
<label class="control-label">4.15 - Sintomas, Sinais e Afecções mal definidas. </label>
<label class="control-label">Especifique:</label>
<textarea ng-model="editing.doencasActivas.sintomas_sinais_afeccoes_detalhe" rows="3" class="form-control"></textarea>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="control-label">4.4 - Doenças do sangue e Orgãos Hematopoieticos</label>
<div class="checkbox">
<label>
<input ng-model="editing.doencasActivas.doencas_sangue_anemia" value="true" type="checkbox" />
Anemia
</label>
</div>
<div class="checkbox">
<div class="row">
<div class="col-md-4">
<label>
<input ng-model="editing.doencasActivas.doencas_sangue_outras" value="true" type="checkbox" />
Outras
</label>
</div>
<div class="col-md-8 p-l-none">
<div ng-show="editing.doencasActivas.doencas_sangue_outras" class="row">
<div class="col-md-2">
<label class="control-label">Quais</label>
</div>
<div class="col-md-10">
<textarea ng-model="editing.doencasActivas.doencas_sangue_outras_detalhe" rows="3" class="form-control"></textarea>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="form-group">
<label class="control-label">4.6 - Doenças do SNC e Orgãos dos Sentidos</label>
<div class="checkbox">
<label>
<input ng-model="editing.doencasActivas.doencas_snc_visao" value="true" type="checkbox" />
Alterações da Visão
</label>
</div>
<div class="checkbox">
<label>
<input ng-model="editing.doencasActivas.doencas_snc_audicao" value="true" type="checkbox" />
Alterações da Audição
</label>
</div>
<div class="checkbox">
<label>
<input ng-model="editing.doencasActivas.doencas_snc_epilepsia" value="true" type="checkbox" />
Epilepsia
</label>
</div>
<div class="checkbox">
<div class="row">
<div class="col-md-4">
<label>
<input ng-model="editing.doencasActivas.doencas_snc_outras" value="true" type="checkbox" />
Outras
</label>
</div>
<div class="col-md-8 p-l-none">
<div ng-show="editing.doencasActivas.doencas_snc_outras" class="row">
<div class="col-md-2">
<label class="control-label">Quais</label>
</div>
<div class="col-md-10">
<textarea ng-model="editing.doencasActivas.doencas_snc_outras_detalhe" rows="3" class="form-control"></textarea>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="form-group">
<label class="control-label">4.8 - Doenças do Aparelho Respiratório</label>
<div class="checkbox">
<label>
<input ng-model="editing.doencasActivas.doencas_respiratorio_sinusite" value="true" type="checkbox" />
Sinusite
</label>
</div>
<div class="checkbox">
<label>
<input ng-model="editing.doencasActivas.doencas_respiratorio_rinite" value="true" type="checkbox" />
Rinite
</label>
</div>
<div class="checkbox">
<label>
<input ng-model="editing.doencasActivas.doencas_respiratorio_bronquite" value="true" type="checkbox" />
Bronquite
</label>
</div>
<div class="checkbox">
<label>
<input ng-model="editing.doencasActivas.doencas_respiratorio_asma" value="true" type="checkbox" />
Asma
</label>
</div>
<div class="checkbox">
<label>
<input ng-model="editing.doencasActivas.doencas_respiratorio_pneumoconiose" value="true" type="checkbox" />
Pneumoconiose
</label>
</div>
<div class="checkbox">
<div class="row">
<div class="col-md-4">
<label>
<input ng-model="editing.doencasActivas.doencas_respiratorio_outras" value="true" type="checkbox" />
Outras
</label>
</div>
<div class="col-md-8 p-l-none">
<div ng-show="editing.doencasActivas.doencas_respiratorio_outras" class="row">
<div class="col-md-2">
<label class="control-label">Quais</label>
</div>
<div class="col-md-10">
<textarea ng-model="editing.doencasActivas.doencas_respiratorio_outras_detalhe" rows="3" class="form-control"></textarea>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="form-group">
<label class="control-label">4.10 - Doenças do Aparelho Genito/Urinário</label>
<div class="checkbox">
<div class="row">
<div class="col-md-4">
<label>
<input ng-model="editing.doencasActivas.doencas_genito_urinario_urinaria" value="true" type="checkbox" />
Doença Urinária
</label>
</div>
<div class="col-md-8 p-l-none">
<div ng-show="editing.doencasActivas.doencas_genito_urinario_urinaria" class="row">
<div class="col-md-2">
<label class="control-label">Qual</label>
</div>
<div class="col-md-10">
<input ng-model="editing.doencasActivas.doencas_genito_urinario_urinaria_detalhe" type="text" class="form-control" />
</div>
</div>
</div>
</div>
</div>
<div class="checkbox">
<div class="row">
<div class="col-md-4">
<label>
<input ng-model="editing.doencasActivas.doencas_genito_urinario_ginecologica" value="true" type="checkbox" />
Doença Ginecológica
</label>
</div>
<div class="col-md-8 p-l-none">
<div ng-show="editing.doencasActivas.doencas_genito_urinario_ginecologica" class="row">
<div class="col-md-2">
<label class="control-label">Qual</label>
</div>
<div class="col-md-10">
<input ng-model="editing.doencasActivas.doencas_genito_urinario_ginecologica_detalhe" type="text" class="form-control" />
</div>
</div>
</div>
</div>
</div>
<div class="checkbox">
<div class="row">
<div class="col-md-4">
<label>
<input ng-model="editing.doencasActivas.doencas_genito_urinario_mama" value="true" type="checkbox" />
Doença da Mama
</label>
</div>
<div class="col-md-8 p-l-none">
<div ng-show="editing.doencasActivas.doencas_genito_urinario_mama" class="row">
<div class="col-md-2">
<label class="control-label">Qual</label>
</div>
<div class="col-md-10">
<input ng-model="editing.doencasActivas.doencas_genito_urinario_mama_detalhe" type="text" class="form-control" />
</div>
</div>
</div>
</div>
</div>
</div>
<div class="form-group">
<label class="control-label">4.12 - Doenças da Pele e Tecido Celular Subcutâneo</label>
<div class="checkbox">
<div class="row">
<div class="col-md-4">
<label>
<input ng-model="editing.doencasActivas.doencas_pele_dermatites" value="true" type="checkbox" />
Dermatites
</label>
</div>
<div class="col-md-8 p-l-none">
<div ng-show="editing.doencasActivas.doencas_pele_dermatites" class="row">
<div class="col-md-4">
<label class="control-label">Especifique</label>
</div>
<div class="col-md-8">
<input ng-model="editing.doencasActivas.doencas_pele_dermatites_detalhe" type="text" class="form-control" />
</div>
</div>
</div>
</div>
</div>
<div class="checkbox">
<div class="row">
<div class="col-md-4">
<label>
<input ng-model="editing.doencasActivas.doencas_pele_dermatoses" value="true" type="checkbox" />
Dermatoses
</label>
</div>
<div class="col-md-8 p-l-none">
<div ng-show="editing.doencasActivas.doencas_pele_dermatoses" class="row">
<div class="col-md-4">
<label class="control-label">Especifique</label>
</div>
<div class="col-md-8">
<input ng-model="editing.doencasActivas.doencas_pele_dermatoses_detalhe" type="text" class="form-control" />
</div>
</div>
</div>
</div>
</div>
<div class="checkbox">
<div class="row">
<div class="col-md-4">
<label>
<input ng-model="editing.doencasActivas.doencas_pele_outras" value="true" type="checkbox" />
Outras
</label>
</div>
<div class="col-md-8 p-l-none">
<div ng-show="editing.doencasActivas.doencas_pele_outras" class="row">
<div class="col-md-2">
<label class="control-label">Quais</label>
</div>
<div class="col-md-10">
<input ng-model="editing.doencasActivas.doencas_pele_outras_detalhe" type="text" class="form-control" />
</div>
</div>
</div>
</div>
</div>
</div>
<div class="form-group">
<label class="control-label">4.14 - Anómalias Congénitas. </label>
<label class="control-label">Especifique:</label>
<textarea ng-model="editing.doencasActivas.anomalias_congenitas_detalhe" rows="3" class="form-control"></textarea>
</div>
<div class="form-group">
<label class="control-label">4.16 - Lesões, Acidentes e Envenenamentos</label>
<div class="checkbox">
<label>
<input ng-model="editing.doencasActivas.lesoes_traumatismo_craniano" value="true" type="checkbox" />
Traumatismo Craniano
</label>
</div>
<div class="checkbox">
<label>
<input ng-model="editing.doencasActivas.lesoes_traumatismo_membros_superiores" value="true" type="checkbox" />
Traumatismo dos Membros Superiores
</label>
</div>
<div class="checkbox">
<label>
<input ng-model="editing.doencasActivas.lesoes_traumatismo_membros_inferiores" value="true" type="checkbox" />
Traumatismo dos Membros Inferiores
</label>
</div>
<div class="checkbox">
<label>
<input ng-model="editing.doencasActivas.lesoes_traumatismo_coluna" value="true" type="checkbox" />
Traumatismo da Coluna
</label>
</div>
<div class="checkbox">
<label>
<input ng-model="editing.doencasActivas.lesoes_traumatismo_toracico" value="true" type="checkbox" />
Traumatismo Torácico
</label>
</div>
<div class="checkbox">
<label>
<input ng-model="editing.doencasActivas.lesoes_traumatismo_abdominal" value="true" type="checkbox" />
Traumatismo Abdominal
</label>
</div>
<div class="checkbox">
<div class="row">
<div class="col-md-4">
<label>
<input ng-model="editing.doencasActivas.lesoes_outros" value="true" type="checkbox" />
Outros
</label>
</div>
<div class="col-md-8 p-l-none">
<div ng-show="editing.doencasActivas.lesoes_outros" class="row">
<div class="col-md-2">
<label class="control-label">Quais</label>
</div>
<div class="col-md-10">
<textarea ng-model="editing.doencasActivas.lesoes_outros_detalhe" rows="3" class="form-control"></textarea>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-12">
<div class="form-group">
<label class="control-label">Observações</label>
<textarea ng-model="editing.doencasActivas.observacoes" rows="3" class="form-control"></textarea>
</div>
</div>
</div>

28
trunk/SiprpWebFichasClinicas/WebContent/static/html/app/services/DataService.js
Unescape View File

@ -1,6 +1,6 @@
evoapp.service('dataService', function ($rootScope, $http, $q, $timeout, modelService, $filter) { evoapp.service('dataService', function ($rootScope, $http, $q, $timeout, modelService, $filter) {
var serviceBase = '/Home/'; var serviceBase = 'http://java1.evo.pt:8080/siprp_fichasclinicas/rs/fichasclinicas/';
var record = function(model){ var record = function(model){
@ -35,8 +35,6 @@
this.get = function(){ this.get = function(){
//$rootScope.$emit('onBeforeGet', {store: me});
var callbackFn = arguments[0]; var callbackFn = arguments[0];
params = {start: me.start, limit: me.limit, sort: me.sort, dir: me.dir}; params = {start: me.start, limit: me.limit, sort: me.sort, dir: me.dir};
@ -72,24 +70,20 @@
//processServerDate(response); //processServerDate(response);
//if(response.success) if(response.success)
//{ {
// response.data = me.convertToModel ? modelService.collectionToModel(me.model, response.data, null) : response.data; //response.data = me.convertToModel ? modelService.collectionToModel(me.model, response.data, null) : response.data;
me.total = response.total;
me.items = response.data;
}
// me.total = response.total; callback(callbackFn, [response, status, headers, config, me.items]);
// me.items = response.data;
//}
//callback(callbackFn, [response, status, headers, config, me.items]);
callback(callbackFn, [response, status, headers, config]);
//$rootScope.$emit('onAfterGet', {store: me});
}). }).
error(function(response, status, headers, config) { error(function(response, status, headers, config) {
callback(callbackFn, [response, status, headers, config]); callback(callbackFn, [response, status, headers, config]);
//$rootScope.$emit('onAfterGet', {store: me});
}); });
}; };
@ -122,8 +116,8 @@
$rootScope.$broadcast('response', {response: response}); $rootScope.$broadcast('response', {response: response});
//if(response.success) if(response.success)
//{ {
// var idPropertyValue = editing[modelInstance.idProperty], // var idPropertyValue = editing[modelInstance.idProperty],
// isNewRecord = (idPropertyValue == 0 || idPropertyValue == null || idPropertyValue == undefined); // isNewRecord = (idPropertyValue == 0 || idPropertyValue == null || idPropertyValue == undefined);
@ -141,7 +135,7 @@
// angular.copy(response.data, editing); // angular.copy(response.data, editing);
// angular.copy(response.data, selected); // angular.copy(response.data, selected);
// } // }
//} }
callback(callbackFn, [response, selected, editing, isNewRecord]); callback(callbackFn, [response, selected, editing, isNewRecord]);
}). }).

2
trunk/SiprpWebFichasClinicas/WebContent/static/html/css/theme.css
Unescape View File

@ -1,4 +1,4 @@
/* Sticky footer styles /* Sticky footer styles
-------------------------------------------------- */ -------------------------------------------------- */
html { html {
position: relative; position: relative;

Write Preview
Loading…
Cancel
Save