04 Apr, 2017

1 commit


12 Jun, 2016

1 commit


25 Nov, 2015

1 commit


16 Nov, 2015

1 commit


25 Aug, 2015

2 commits


20 Aug, 2015

2 commits

  • portabilis/ieducar#146
    
    Conflicts:
    	ieducar/intranet/educar_acervo_assunto_lst.php
    	ieducar/intranet/educar_acervo_autor_lst.php
    	ieducar/intranet/educar_acervo_colecao_det.php
    	ieducar/intranet/educar_acervo_colecao_lst.php
    	ieducar/intranet/educar_acervo_editora_lst.php
    	ieducar/intranet/educar_acervo_idioma_lst.php
    	ieducar/intranet/educar_acervo_lst.php
    	ieducar/intranet/educar_biblioteca_dados_lst.php
    	ieducar/intranet/educar_biblioteca_lst.php
    	ieducar/intranet/educar_cliente_lst.php
    	ieducar/intranet/educar_cliente_tipo_lst.php
    	ieducar/intranet/educar_exemplar_devolucao_lst.php
    	ieducar/intranet/educar_exemplar_lst.php
    	ieducar/intranet/educar_exemplar_tipo_lst.php
    	ieducar/intranet/educar_fonte_lst.php
    	ieducar/intranet/educar_infra_predio_cad.php
    	ieducar/intranet/educar_instituicao_cad.php
    	ieducar/intranet/educar_motivo_baixa_lst.php
    	ieducar/intranet/educar_motivo_suspensao_lst.php
    	ieducar/intranet/educar_pagamento_multa_lst.php
    	ieducar/intranet/educar_reservas_lst.php
    	ieducar/intranet/educar_situacao_lst.php
    	ieducar/intranet/educar_turma_tipo_cad.php
    	ieducar/modules/Reports/Views/AlunoEscolaController.php
    	ieducar/modules/Reports/Views/BibliotecaComprovanteDevolucaoController.php
    	ieducar/modules/Reports/Views/BibliotecaComprovanteEmprestimoController.php
    	ieducar/modules/Reports/Views/BibliotecaDevolucaoController.php
    	ieducar/modules/Reports/Views/BibliotecaEmprestimoController.php
    	ieducar/modules/Reports/Views/BibliotecaReciboPagamentoController.php
    	ieducar/modules/Reports/Views/FichaMedicaAlunoController.php
    Lucas Schmoeller da Silva
     
  • Portabilis/ieducar#146
    
    Conflicts:
    	ieducar/intranet/agenda_admin_lst.php
    	ieducar/intranet/agenda_responsavel.php
    	ieducar/intranet/diaria_grupo_lst.php
    	ieducar/intranet/diaria_lst.php
    	ieducar/intranet/educar_abandono_tipo_cad.php
    	ieducar/intranet/educar_abandono_tipo_det.php
    	ieducar/intranet/educar_abandono_tipo_lst.php
    	ieducar/intranet/educar_acervo_autor_lst.php
    	ieducar/intranet/educar_acervo_colecao_det.php
    	ieducar/intranet/educar_acervo_colecao_lst.php
    	ieducar/intranet/educar_acervo_editora_lst.php
    	ieducar/intranet/educar_acervo_idioma_lst.php
    	ieducar/intranet/educar_acervo_lst.php
    	ieducar/intranet/educar_biblioteca_dados_lst.php
    	ieducar/intranet/educar_biblioteca_lst.php
    	ieducar/intranet/educar_cliente_lst.php
    	ieducar/intranet/educar_cliente_tipo_lst.php
    	ieducar/intranet/educar_curso_det.php
    	ieducar/intranet/educar_exemplar_devolucao_lst.php
    	ieducar/intranet/educar_exemplar_lst.php
    	ieducar/intranet/educar_exemplar_tipo_lst.php
    	ieducar/intranet/educar_exportacao_educacenso.php
    	ieducar/intranet/educar_fonte_lst.php
    	ieducar/intranet/educar_motivo_baixa_lst.php
    	ieducar/intranet/educar_motivo_suspensao_lst.php
    	ieducar/intranet/educar_pagamento_multa_lst.php
    	ieducar/intranet/educar_reservas_lst.php
    	ieducar/intranet/educar_situacao_lst.php
    	ieducar/intranet/funcionario_lst.php
    	ieducar/intranet/funcionario_vinculo_lst.php
    	ieducar/intranet/include/clsListagem.inc.php
    	ieducar/intranet/public_bairro_lst.php
    	ieducar/intranet/public_distrito_cad.php
    	ieducar/intranet/public_distrito_det.php
    	ieducar/intranet/public_distrito_lst.php
    	ieducar/intranet/urbano_cep_logradouro_lst.php
    	ieducar/modules/Portabilis/Assets/Version.php
    	ieducar/modules/Reports/Views/AlunoDeficienciaController.php
    	ieducar/modules/Reports/Views/AlunoNotaExameController.php
    	ieducar/modules/Reports/Views/AlunoPorBairroController.php
    	ieducar/modules/Reports/Views/AlunoSemPaiController.php
    	ieducar/modules/Reports/Views/AlunoTurmaController.php
    	ieducar/modules/Reports/Views/AtestadoFrequenciaController.php
    	ieducar/modules/Reports/Views/AtestadoTransferenciaController.php
    	ieducar/modules/Reports/Views/AutorizacaoAlunoController.php
    	ieducar/modules/Reports/Views/BibliotecaComprovanteDevolucaoController.php
    	ieducar/modules/Reports/Views/BibliotecaComprovanteEmprestimoController.php
    	ieducar/modules/Reports/Views/BibliotecaDevolucaoController.php
    	ieducar/modules/Reports/Views/BibliotecaEmprestimoController.php
    	ieducar/modules/Reports/Views/BibliotecaReciboPagamentoController.php
    	ieducar/modules/Reports/Views/BoletimProfessorController.php
    	ieducar/modules/Reports/Views/CalendarioController.php
    	ieducar/modules/Reports/Views/CarteiraEstudanteController.php
    	ieducar/modules/Reports/Views/CarteiraTransporteController.php
    	ieducar/modules/Reports/Views/DeclaracaoAnuenciaController.php
    	ieducar/modules/Reports/Views/DesempenhoClassesController.php
    	ieducar/modules/Reports/Views/DiarioClasseCapaModelo1Controller.php
    	ieducar/modules/Reports/Views/DiarioClasseCapaModelo2Controller.php
    	ieducar/modules/Reports/Views/DiarioClasseContraCapaController.php
    	ieducar/modules/Reports/Views/EscolaController.php
    	ieducar/modules/Reports/Views/FichaAlunoBrancoController.php
    	ieducar/modules/Reports/Views/FichaIndividualCbalController.php
    	ieducar/modules/Reports/Views/FichaIndividualPAController.php
    	ieducar/modules/Reports/Views/GraficoAlunoMatriculadoController.php
    	ieducar/modules/Reports/Views/GraficoAlunoTransporteController.php
    	ieducar/modules/Reports/Views/HistoricoInfantilController.php
    	ieducar/modules/Reports/Views/HistoricoInfantilParecerController.php
    	ieducar/modules/Reports/Views/HoraAlocadoServidorController.php
    	ieducar/modules/Reports/Views/LivroMatriculaController.php
    	ieducar/modules/Reports/Views/MapaConselhoClasseController.php
    	ieducar/modules/Reports/Views/MapaQuantitativoMatriculasController.php
    	ieducar/modules/Reports/Views/MapaQuantitativoUniformeController.php
    	ieducar/modules/Reports/Views/MatriculaEscolaController.php
    	ieducar/modules/Reports/Views/MoradiaAlunoController.php
    	ieducar/modules/Reports/Views/MovimentoAlunosController.php
    	ieducar/modules/Reports/Views/NaoEnturmadosController.php
    	ieducar/modules/Reports/Views/NotasFaltasLancadasController.php
    	ieducar/modules/Reports/Views/OcorrenciaDisciplinarController.php
    	ieducar/modules/Reports/Views/ParecerFinalCbalController.php
    	ieducar/modules/Reports/Views/RegistroAvaliacaoAnosFinaisController.php
    	ieducar/modules/Reports/Views/RegistroAvaliacaoAnosIniciaisController.php
    	ieducar/modules/Reports/Views/RegistroFrequenciaAnosFinaisController.php
    	ieducar/modules/Reports/Views/RegistroFrequenciaAnosIniciaisController.php
    	ieducar/modules/Reports/Views/RelatorioRotaController.php
    	ieducar/modules/Reports/Views/ResultadoFinalController.php
    	ieducar/modules/Reports/Views/ServidoresFaltasAtrasosController.php
    	ieducar/modules/Reports/Views/SinteseCompetenciaHabilidadeCbalController.php
    	ieducar/modules/Reports/Views/TransferidoAbandonoController.php
    	ieducar/modules/Reports/Views/TransporteCarteiraController.php
    	ieducar/modules/Reports/Views/UsuarioAcessoController.php
    	ieducar/modules/Reports/Views/UsuarioTransporteEscolaController.php
    	ieducar/modules/Reports/Views/UsuariosTransporteEmpresaController.php
    Lucas Schmoeller da Silva
     

17 Mar, 2015

2 commits


27 Dec, 2013

1 commit


08 Aug, 2013

1 commit


19 Jun, 2013

1 commit


15 Mar, 2013

1 commit


06 Mar, 2013

1 commit


21 Feb, 2013

1 commit


15 Feb, 2013

1 commit


31 Jan, 2013

1 commit


14 Sep, 2010

1 commit


13 Sep, 2010

2 commits

  •  * Adicionado campo {{{zona_localizacao}}} nas tabelas {{{cadastro.endereco_externo}}} e {{{public.bairro}}}. Por padrão, o valor do campo é "1"
     * Adicionado novo enum: {{{App_Model_ZonaLocalizacao}}} para manter os valores para zona urbana (1, padrão do campo {{{zona_localizacao}}} nas tabelas no banco de dados) e rural (2)
     * Atualizado CRUD de aluno para exibir o campo "Zona Localização"
     * Atualizado CRUD de pessoa física para exibir o campo "Zona Localização"
     * TODO: adicionar campo nos cadastros relacionados a pessoa jurídica (escola e pessoa jurídica)
    Eriksen Costa
     
  • Eriksen Costa
     

11 Mar, 2009

1 commit