Download as
Browse Code »

Commit 32acab82486359d19c770472989c97162e159a1c

Authored by Rafael Santos
2 parents cc6c8ad2 691e3ffa
Exists in master

resolvendo conflito

Showing 9 changed files with 60 additions and 4 deletions   Show diff stats
.gitignore
View file @cc6c8ad
@@ -1,4 +0,0 @@ @@ -1,4 +0,0 @@
1 -ieducar/configuration/*.ini  
2 -*~  
3 -nbproject/*  
4 -/ieducar/nbproject/private/  
5 \ No newline at end of file 0 \ No newline at end of file
ieducar/intranet/educar_exemplar_devolucao_lst.php
  Diff comments   View file @32acab8
@@ -28,6 +28,7 @@ require_once ("include/clsBase.inc.php"); @@ -28,6 +28,7 @@ require_once ("include/clsBase.inc.php");
28 require_once ("include/clsListagem.inc.php"); 28 require_once ("include/clsListagem.inc.php");
29 require_once ("include/clsBanco.inc.php"); 29 require_once ("include/clsBanco.inc.php");
30 require_once( "include/pmieducar/geral.inc.php" ); 30 require_once( "include/pmieducar/geral.inc.php" );
  31 +require_once ("include/localizacaoSistema.php");
31 32
32 class clsIndexBase extends clsBase 33 class clsIndexBase extends clsBase
33 { 34 {
@@ -35,6 +36,7 @@ class clsIndexBase extends clsBase @@ -35,6 +36,7 @@ class clsIndexBase extends clsBase
35 { 36 {
36 $this->SetTitulo( "{$this->_instituicao} i-Educar - Exemplar Devolução" ); 37 $this->SetTitulo( "{$this->_instituicao} i-Educar - Exemplar Devolução" );
37 $this->processoAp = "628"; 38 $this->processoAp = "628";
  39 + $this->addEstilo( "localizacaoSistema" );
38 } 40 }
39 } 41 }
40 42
@@ -248,6 +250,14 @@ class indice extends clsListagem @@ -248,6 +250,14 @@ class indice extends clsListagem
248 } 250 }
249 $this->addPaginador2( "educar_exemplar_devolucao_lst.php", $total, $_GET, $this->nome, $this->limite ); 251 $this->addPaginador2( "educar_exemplar_devolucao_lst.php", $total, $_GET, $this->nome, $this->limite );
250 $this->largura = "100%"; 252 $this->largura = "100%";
  253 +
  254 + $localizacao = new LocalizacaoSistema();
  255 + $localizacao->entradaCaminhos( array(
  256 + $_SERVER['SERVER_NAME']."/intranet" => "i-Educar",
  257 + "educar_biblioteca_index.php" => "Biblioteca",
  258 + "" => "Lista de Devoluções"
  259 + ));
  260 + $this->enviaLocalizacao($localizacao->montar());
251 } 261 }
252 } 262 }
253 // cria uma extensao da classe base 263 // cria uma extensao da classe base
ieducar/intranet/educar_pagamento_multa_lst.php
  Diff comments   View file @32acab8
@@ -31,6 +31,7 @@ require_once ("include/clsBase.inc.php"); @@ -31,6 +31,7 @@ require_once ("include/clsBase.inc.php");
31 require_once ("include/clsListagem.inc.php"); 31 require_once ("include/clsListagem.inc.php");
32 require_once ("include/clsBanco.inc.php"); 32 require_once ("include/clsBanco.inc.php");
33 require_once( "include/pmieducar/geral.inc.php" ); 33 require_once( "include/pmieducar/geral.inc.php" );
  34 +require_once ("include/localizacaoSistema.php");
34 35
35 class clsIndexBase extends clsBase 36 class clsIndexBase extends clsBase
36 { 37 {
@@ -38,6 +39,7 @@ class clsIndexBase extends clsBase @@ -38,6 +39,7 @@ class clsIndexBase extends clsBase
38 { 39 {
39 $this->SetTitulo( "{$this->_instituicao} i-Educar - Pagamento Multa" ); 40 $this->SetTitulo( "{$this->_instituicao} i-Educar - Pagamento Multa" );
40 $this->processoAp = "622"; 41 $this->processoAp = "622";
  42 + $this->addEstilo( "localizacaoSistema" );
41 } 43 }
42 } 44 }
43 45
@@ -211,6 +213,14 @@ class indice extends clsListagem @@ -211,6 +213,14 @@ class indice extends clsListagem
211 // } 213 // }
212 214
213 $this->largura = "100%"; 215 $this->largura = "100%";
  216 +
  217 + $localizacao = new LocalizacaoSistema();
  218 + $localizacao->entradaCaminhos( array(
  219 + $_SERVER['SERVER_NAME']."/intranet" => "i-Educar",
  220 + "educar_biblioteca_index.php" => "Biblioteca",
  221 + "" => "Lista de Dívidas"
  222 + ));
  223 + $this->enviaLocalizacao($localizacao->montar());
214 } 224 }
215 } 225 }
216 // cria uma extensao da classe base 226 // cria uma extensao da classe base
ieducar/intranet/funcionario_lst.php
  Diff comments   View file @32acab8
@@ -81,7 +81,11 @@ class indice extends clsListagem @@ -81,7 +81,11 @@ class indice extends clsListagem
81 $localizacao = new LocalizacaoSistema(); 81 $localizacao = new LocalizacaoSistema();
82 $localizacao->entradaCaminhos( array( 82 $localizacao->entradaCaminhos( array(
83 $_SERVER['SERVER_NAME']."/intranet" => "i-Educar", 83 $_SERVER['SERVER_NAME']."/intranet" => "i-Educar",
  84 +<<<<<<< HEAD
84 "" => "Cadastro de Funcionários" 85 "" => "Cadastro de Funcionários"
  86 +=======
  87 + "" => "Lista de Funcionários"
  88 +>>>>>>> 691e3ffa3b5f4c6dd70c0728bccfc00e665bf077
85 )); 89 ));
86 $this->enviaLocalizacao($localizacao->montar()); 90 $this->enviaLocalizacao($localizacao->montar());
87 } 91 }
nbproject/private/config.properties 0 → 100644
  Diff comments   View file @32acab8
nbproject/private/private.properties 0 → 100644
  Diff comments   View file @32acab8
@@ -0,0 +1,5 @@ @@ -0,0 +1,5 @@
  1 +copy.src.files=false
  2 +copy.src.target=/var/www/ieducar
  3 +index.file=
  4 +run.as=LOCAL
  5 +url=http://localhost/
nbproject/private/private.xml 0 → 100644
  Diff comments   View file @32acab8
@@ -0,0 +1,4 @@ @@ -0,0 +1,4 @@
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<project-private xmlns="http://www.netbeans.org/ns/project-private/1">
  3 + <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
  4 +</project-private>
nbproject/project.properties 0 → 100644
  Diff comments   View file @32acab8
@@ -0,0 +1,18 @@ @@ -0,0 +1,18 @@
  1 +file.reference.php-PHPUnit=../../../usr/share/php/PHPUnit
  2 +include.path=\
  3 + ${php.global.include.path}:\
  4 + ${file.reference.php-PHPUnit}
  5 +php.version=PHP_53
  6 +phpunit.bootstrap=ieducar/tests/bootstrap.php
  7 +phpunit.bootstrap.create.tests=false
  8 +phpunit.configuration=ieducar/phpunit.xml
  9 +phpunit.run.test.files=true
  10 +phpunit.script=
  11 +phpunit.suite=
  12 +phpunit.test.groups.ask=false
  13 +source.encoding=ISO-8859-1
  14 +src.dir=.
  15 +tags.asp=false
  16 +tags.short=true
  17 +test.src.dir=ieducar/tests
  18 +web.root=.
nbproject/project.xml 0 → 100644
  Diff comments   View file @32acab8
@@ -0,0 +1,9 @@ @@ -0,0 +1,9 @@
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<project xmlns="http://www.netbeans.org/ns/project/1">
  3 + <type>org.netbeans.modules.php.project</type>
  4 + <configuration>
  5 + <data xmlns="http://www.netbeans.org/ns/php-project/1">
  6 + <name>ieducar</name>
  7 + </data>
  8 + </configuration>
  9 +</project>