Rel COMADEP

samuelemes · Sep 26, 2016 · de12ccc · de12ccc
1 parent 9f65635
commit de12ccc
Show file tree

Hide file tree

Showing 13 changed files with 88 additions and 101 deletions.
diff --git a/aniv/aniversario.php b/aniv/aniversario.php
@@ -5,15 +5,13 @@
 
 if ($_GET["Submit"]=="Imprimir") {
 
-	session_start();
-	require_once ("../func_class/funcoes.php");
-	require_once ("../func_class/classes.php");
+session_start();
+require_once ("../func_class/funcoes.php");
+require_once ("../func_class/classes.php");
 
-	controle ("consulta");
+controle ("consulta");
 $igreja = new DBRecord ( 'igreja', '1', 'rol' );
-
 ?>
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html>
@@ -70,7 +68,6 @@ function MM_jumpMenu(targ,selObj,restore){ //v3.0
     $cong_sele = " - Todas as congrega&ccedil;&otilde;es";
 }
 ?>
-
 <table cellspacing="0" id="listTable" class='table' summary="Idade, Rol, Nome, Congregação e Cargo">
 <caption>
 Lista de Aniversariantes
@@ -84,17 +81,14 @@ function MM_jumpMenu(targ,selObj,restore){ //v3.0
 }
 echo $cong_sele;
 ?>
-
 </caption>
-
 <colgroup>
 <col id="PlaylistCol" />
 <col id="Rol" />
 <col id="Nome" />
 <col id="Congrega" />
 <col id="albumCol" />
 </colgroup>
-
 <thead>
 <tr>
 <th id="" scope="col">Idade</th>
@@ -115,16 +109,12 @@ function MM_jumpMenu(targ,selObj,restore){ //v3.0
 <th scope="col">Cargo</th>
 </tr>
 </thead>
-
 <tbody>
-
 <?PHP
 $aniv->nome_dia();
 ?>
 </tbody>
-
 </table>
-
 <?php
 	echo $fimPagina ;
 ?>
diff --git a/aniv/navega.php b/aniv/navega.php
@@ -1,21 +1,34 @@
-<fieldset>
-<legend> Navegue</legend>
-
   <form id="form1" name="form1" method="get" action="<?PHP echo $_GET["escolha"];?>">
-	<input name="proxima" type="hidden" value="<?PHP echo $_GET["proxima"];?>" /> 
-	<input name="ord" type="hidden" value="<?PHP echo $_GET["ord"];?>" />  
-	<input name="congregacao" type="hidden" value="<?PHP echo $_GET["congregacao"];?>" />   
-	<input type="submit" name="Submit" class="btn btn-primary" value="Imprimir" /> 
-
-	<a href="./?escolha=<?PHP echo $_GET["escolha"];?>&proxima=<?PHP echo $anterior;?>&ord=<?PHP echo $_GET["ord"];?>&congregacao=<?PHP echo $_GET["congregacao"];?>" ><img src="img/1910_32x32.png" alt="MSemana Anteriorr" width="22" height="22" title="Semana Anterior" align="absmiddle" border="0" /></a> <a href="./?escolha=<?PHP echo $_GET["escolha"];?>&proxima=<?PHP echo $proximo;?>&ord=<?PHP echo $_GET["ord"];?>&congregacao=<?PHP echo $_GET["congregacao"];?>" t><img src="img/1967_32x32.png" width="22" height="22" title="Pr&oacute;xima Semana" alt="Pr&oacute;xima Semana" align="absmiddle" border="0"/></a> 
-
-  <select name="menu1" onchange="MM_jumpMenu('parent',this,0)" class="btn btn-primary" >
-    <option>--&gt;&gt; Escolha a Congrega&ccedil;&atilde;o&lt;&lt;-- </option>
-    <option value="./?escolha=<?PHP echo $_GET["escolha"];?>&amp;proxima=<?PHP echo $_GET["proxima"];?>&amp;ord=<?PHP echo $_GET["ord"];?>&amp;congregacao=0">Todas as Congregac&otilde;es</option>
-	<?PHP
-		$congr = new List_sele ("igreja","razao","congregacao");
-		$congr->List_Selec_pop ("escolha={$_GET["escolha"]}&proxima={$_GET["proxima"]}&ord={$_GET["ord"]}&congregacao=");
-	?>
-    </select>
+	<input name="proxima" type="hidden" value="<?PHP echo $_GET["proxima"];?>" />
+	<input name="ord" type="hidden" value="<?PHP echo $_GET["ord"];?>" />
+	<input name="congregacao" type="hidden" value="<?PHP echo $_GET["congregacao"];?>" />
+  <div class="row">
+    <div class="col-xs-2">
+      	<input type="submit" name="Submit" class="btn btn-primary" value="Imprimir" />
+    </div>
+    <div class="col-xs-5">
+    <div class="btn-group" role="group" aria-label="...">
+      <a href="./?escolha=<?PHP echo $_GET["escolha"];?>&proxima=<?PHP
+      echo $anterior;?>&ord=<?PHP echo $_GET["ord"];?>&congregacao=<?PHP
+      echo $_GET["congregacao"];?>" type="button" class="btn btn-primary">
+        <span class="glyphicon glyphicon-backward" aria-hidden="true"> </span> Voltar um dia
+     </a>
+    <a href="./?escolha=<?PHP echo $_GET["escolha"];?>&proxima=<?PHP echo
+     $proximo;?>&ord=<?PHP echo $_GET["ord"];?>&congregacao=<?PHP echo $_GET["congregacao"];
+     ?>" type="button" class="btn btn-primary">Avan&ccedil;ar um dia
+     <span class="glyphicon glyphicon-forward" aria-hidden="true"> </span>
+    </a>
+    </div>
+    </div>
+    <div class="col-xs-4">
+      <select name="igreja" id="igreja" class="form-control" onchange="MM_jumpMenu('parent',this,0)" tabindex="<?PHP echo ++$ind; ?>" >
+  		<?php
+      $congr = new List_sele ("igreja","razao","congregacao");
+      $linkAcesso="escolha={$_GET["escolha"]}&proxima={$_GET["proxima"]}&ord={$_GET["ord"]}&congregacao=";
+  		$listaIgreja = $congr->List_Selec_pop($linkAcesso,$_GET['congregacao']);
+  		//echo $listaIgreja;
+  		?>
+  		</select>
+    </div>
+</div>
   </form>
-</fieldset>
diff --git a/forms/tes/mesComadep.php b/forms/tes/mesComadep.php
@@ -23,11 +23,14 @@ class="form-control" placeholder="dia" />
 						      echo $linha1.$linha2;
 
 						      //Marca a op��o atual para lista Com e Sem o n�vel mais baixo
-						      if ($_GET['tipo']=='1') {
 						      	$Completo = '';
+						      	$Simples = '';
+						      	$Comadep = '';
+						      if ($_GET['tipo']=='1') {
 						      	$Simples = 'active';
+						      }elseif ($_GET['tipo']=='4') {
+						      	$Comadep = 'active';
 						      }elseif (empty($_GET['tipo']) || $_GET['tipo']=='2') {
-						      	$Simples = '';
 						      	$Completo = 'active';
 						      }
 					      ?>
@@ -48,6 +51,9 @@ class="form-control" placeholder="dia" />
 					  <label class="btn btn-primary <?php echo $Completo;?>">
 					    <input type="radio" name="tipo" value='2' >2 N&iacute;veis
 					  </label>
+					  <label class="btn btn-primary <?php echo $Comadep;?>">
+					    <input type="radio" name="tipo" value='4' >COMADEP
+					  </label>
 				  </div>
 				</td>
 				<td>
@@ -59,12 +65,12 @@ class="form-control" placeholder="dia" />
 					?>
 				</td>
 				<td>
-					<br /><br />
 				  <div class="form-group">
 					<input name="escolha" type="hidden" value="tesouraria/receita.php" />
-					<input type="hidden" name="rec"	value="6" class="form-control" />
+					<label>&nbsp;</label>
 					<input type="submit" class="btn btn-primary" name="Submit" value="Listar..."
 					tabindex="<?PHP echo ++$ind; ?>" />
+					<input type="hidden" name="rec"	value="6" class="form-control" />
 					<input name="menu" type="hidden" value="top_tesouraria" />
 				  </div>
 				</td>

diff --git a/help/tes/receitaImprimir.php b/help/tes/receitaImprimir.php
@@ -34,6 +34,13 @@
 		require_once '../models/tes/relComadep.php';
 		require_once '../help/tes/relComadepLin.php';
 		$nomeArquivo='../views/saldosComadep.php';
+		$assinatura .= '<h5><div class="row">';
+		$assinatura .= '<div class="col-xs-6 col-sm-5">';
+		$assinatura .= 'Pr. Antônio Ferreira da Silva';
+		$assinatura .= '</div>';
+		$assinatura .= '<div class="col-xs-6 col-sm-5">';
+		$assinatura .= 'Tes. Joseilton C Bruce';
+		$assinatura .= '</div></div></h5>';
 		$titTabela = $congRelatorio.' &bull; Fluxo das Contas - '.$dtRelatorio;
 		require_once '../views/modeloPrint.php';
 		break;

diff --git a/help/tes/receitaTela.php b/help/tes/receitaTela.php
@@ -1,7 +1,7 @@
 <?php
 //Op��es de exibir na tela para o script /tesouraria/receita.php
 //$dtlanc = (empty($dtlanc)) ? date('d/m/Y'):$_GET['data'];
-
+$assinatura = '';
 if (empty($_GET['ano'])) {
 	$ano = date('Y');
 	$anoForm = '';

diff --git a/help/tes/relComadepG2.php b/help/tes/relComadepG2.php
@@ -9,7 +9,6 @@
 	} else {
 		$movSld = '--o--';
 	}
-
 	$sldGrupoCtaAnte = $saldoAnteGrp[$planoCod[$ctaAtualN4]['nivel4']];//Sld anterior grupo nível 4
 	$saldoAntr = number_format(abs($sldGrupoCtaAnte),2,',','.');
 	if ($sldGrupoCtaAnte > 0) {
@@ -19,7 +18,6 @@
 	} else {
 		$saldoAntr = '--o--';
 	}
-
 	$sldGrupoAtual = $sldGrupoCta+$sldGrupoCtaAnte;//Sld atual grupo nível 4
 	$saldoAtl = number_format(abs($sldGrupoAtual),2,',','.');
 	if ($sldGrupoCtaAnte > 0) {
@@ -29,19 +27,16 @@
 	} else {
 		$saldoAtl = '--o--';
 	}
-
 	$nivelGrupo =$planoCod[$ctaAtualN4]['nivel4'].'</td><td title="'.$title.'">'
 		.$planoCod[$planoCod[$ctaAtualN4]['nivel4']]['titulo'].'</td><td id="moeda">'.$movSld
 		.'</td><td id="moeda">'.$saldoAtl.'</td>
 		<td id="moeda">'.$saldoAntr.'</td></tr>';
-
 	$nivelGrupoN2 = '<tr><td>'.$nivelGrupo;
-	$nivelGrupo = '<tr class="primary"><td>'.$nivelGrupo;
-
+	$nivelCom02 .= '<tr><td>'.$nivelGrupo;
+	$nivelGrupo = '<tr class="success"><td>'.$nivelGrupo;
 	$codAcesso = sprintf ("%'04u",$planoCod[$chave]['acesso']);
 	$nivel2 .= $nivelGrupo.$nivel1;
 	$nivelN2 .= $nivelGrupoN2;
-
 	//Contas Nivel codigo, tipo: 1.1.1.001.001
 	$nivel1 = '<tr><td>'.$chave.'</td><td title="'.$title.'">'.'['.$codAcesso.'] - '.$planoCod[$chave]['titulo'].
 		'</td><td id="moeda">'.$vlrSaldo.'</td><td id="moeda">'.$vlrSaldoAtual.'</td><td id="moeda">'.$vlrSaldoAnte.'</td></tr>';
diff --git a/help/tes/relComadepG3.php b/help/tes/relComadepG3.php
@@ -10,7 +10,6 @@
 	} else {
 		$movSld = '--o--';
 	}
-
 	$sldGrupoCtaAnte = $saldoAnteGrp[$planoCod[$ctaAtualN2]['nivel2']];//Sld anterior grupo nível 2
 	$saldoAntr = number_format(abs($sldGrupoCtaAnte),2,',','.');
 	if ($sldGrupoCtaAnte > 0) {
@@ -20,7 +19,6 @@
 	} else {
 		$saldoAntr = '--o--';
 	}
-
 	$sldGrupoAtual = $sldGrupoCta+$sldGrupoCtaAnte;//Sld atual grupo nível 2
 	$saldoAtual = number_format(abs($sldGrupoAtual),2,',','.');
 	if ($sldGrupoCtaAnte > 0) {
@@ -30,7 +28,6 @@
 	} else {
 		$saldoAtual = '--o--';
 	}
-
 	#$movSld = ($sldGrupoCta > '0') ? $dev : $cred ;
 	#$saldoAtual = ($sldGrupoAtual > '0') ? $dev : $cred ;
 	#$saldoAntr = ($sldGrupoCtaAnte > '0') ? $dev: $cred;
@@ -42,7 +39,6 @@
 	$nivelN02 .=	$saldoAtual.'</td>';
 	$nivelN02 .=	'<td class="text-right">';
 	$nivelN02 .=	$saldoAntr.'</td></tr>';
-
 	$grpN2 .= $nivelN02.$grpN3;
 }
 	$grpN3 = '';
diff --git a/help/tes/relComadepGrp.php b/help/tes/relComadepGrp.php
@@ -10,7 +10,6 @@
 	} else {
 		$movSld = '--o--';
 	}
-
 	$sldGrupoCtaAnte = $saldoAnteGrp[$planoCod[$ctaAtualN3]['nivel3']];//Sld anterior grupo nível 3
 	$saldoAntr = number_format(abs($sldGrupoCtaAnte),2,',','.');
 	if ($sldGrupoCtaAnte > 0) {
@@ -20,7 +19,6 @@
 	} else {
 		$saldoAntr = '--o--';
 	}
-
 	$sldGrupoAtual = $sldGrupoCta+$sldGrupoCtaAnte;//Sld atual grupo nível 3
 	$saldoAtual = number_format(abs($sldGrupoAtual),2,',','.');
 	if ($sldGrupoCtaAnte > 0) {
@@ -30,7 +28,6 @@
 	} else {
 		$saldoAtual = '--o--';
 	}
-
 	#$movSld = ($sldGrupoCta > '0') ? $dev : $cred ;
 	#$saldoAtual = ($sldGrupoAtual > '0') ? $dev : $cred ;
 	#$saldoAntr = ($sldGrupoCtaAnte > '0') ? $dev: $cred;
@@ -42,11 +39,13 @@
 	$nivelN3 .=	$saldoAtual.'</td>';
 	$nivelN3 .=	'<td class="text-right">';
 	$nivelN3 .=	$saldoAntr.'</td></tr>';
-
 	$nivel3   .= $nivelN3.$nivel2;
 //	$nivelNi2 .= $nivelN02.$nivelN3.$nivelN2;
 	$grpN3 .= $nivelN3.$nivel2;
 }
+	$nivelCom01 .= $nivelN3.$nivelCom02;
+	$nivelCom02 = '';
 	$nivel2 = '';
 	$nivelN2 = '';
 	$nivelN02 = '';
+	$nivelN3 = '';