From 90878700315c8cae6a624c9f921765dc3839bcc3 Mon Sep 17 00:00:00 2001
From: Joseilton Csota Bruce <hiltonbruce@E14135745.14SPRFPB.GOV.BR>
Date: Thu, 4 Jul 2019 15:00:10 -0300
Subject: [PATCH] Aniversariantes V 0.1.0

---
 aniv/aniversario.php    |  3 ---
 aniv/batismo.php        | 17 ++++++++---------
 aniv/casamento.php      | 36 ++++++++++++------------------------
 aniv/mes.php            | 34 ++--------------------------------
 aniv/navega.php         | 24 ++++++++++++++++++------
 aniv/semana.php         | 23 +++++++++++------------
 css/bootstrap.print.css |  4 ++--
 func_class/classes.php  |  2 +-
 8 files changed, 54 insertions(+), 89 deletions(-)

diff --git a/aniv/aniversario.php b/aniv/aniversario.php
index 36dab751..370bdb67 100755
--- a/aniv/aniversario.php
+++ b/aniv/aniversario.php
@@ -42,10 +42,7 @@
 }else {
 	$fimPagina = 'Voc&ecirc; pode ordenar por Rol, Nome e Congrega&ccedil;&atilde;o &quot;click&quot; no cabe&ccedil;alho. Por padr&atilde;o ele ordena pelo nome do membro.
 ';
-echo "<style type='text/css'> <!--";
-	require_once ("aniv/style.css");
 ?>
-</style>
 <script type="text/JavaScript">
 <!--
 function MM_jumpMenu(targ,selObj,restore){ //v3.0
diff --git a/aniv/batismo.php b/aniv/batismo.php
index 80408c43..e91a2e75 100755
--- a/aniv/batismo.php
+++ b/aniv/batismo.php
@@ -1,5 +1,5 @@
 <?PHP
-  
+
 $anterior=$_GET["proxima"]-1;
 $proximo=$_GET["proxima"]+1;
 
@@ -7,8 +7,8 @@
 
 	session_start();
 	require_once ("../func_class/funcoes.php");
-	require_once ("../func_class/classes.php"); 
-	
+	require_once ("../func_class/classes.php");
+
 	controle ("consulta");
 	echo "<style type='text/css'> <!--";
 	require_once ("style.css");
@@ -26,10 +26,9 @@ function MM_jumpMenu(targ,selObj,restore){ //v3.0
 }
 //-->
 </script>
-
-<?PHP 
+<?PHP
 	require_once ("aniv/navega.php");
-} 
+}
 //Código para exibir de qual congregação é a lista de aniversariantes
 $congrega = new DBRecord ("igreja","{$_GET["congregacao"]}","rol");
 if ($_GET["congregacao"]>"0" ) {
@@ -42,7 +41,7 @@ function MM_jumpMenu(targ,selObj,restore){ //v3.0
 <caption>
 Aniversariantes de Batismo em Águas
 
-<?PHP 
+<?PHP
 $aniv = new aniversario;
 
 if ($_GET["proxima"]=="" || $_GET["proxima"]=="0"){
@@ -51,7 +50,7 @@ function MM_jumpMenu(targ,selObj,restore){ //v3.0
 	echo "do Dia: ".$aniv->data_consulta ();}
 
 ?>
- 
+
 </caption>
 
 <colgroup>
@@ -91,4 +90,4 @@ function MM_jumpMenu(targ,selObj,restore){ //v3.0
 </tbody>
 
 </table>
-Voc&ecirc; pode ordenar por Rol, Nome e Congrega&ccedil;&atilde;o &quot;click&quot; no cabe&ccedil;alho. Por padr&atilde;o ele ordena pelo nome do membro. 
\ No newline at end of file
+Voc&ecirc; pode ordenar por Rol, Nome e Congrega&ccedil;&atilde;o &quot;click&quot; no cabe&ccedil;alho. Por padr&atilde;o ele ordena pelo nome do membro.
diff --git a/aniv/casamento.php b/aniv/casamento.php
index 867c7459..079fe841 100755
--- a/aniv/casamento.php
+++ b/aniv/casamento.php
@@ -1,5 +1,5 @@
 <?PHP
-  
+
 $anterior=$_GET["proxima"]-1;
 $proximo=$_GET["proxima"]+1;
 
@@ -7,17 +7,15 @@
 
 	session_start();
 	require_once ("../func_class/funcoes.php");
-	require_once ("../func_class/classes.php"); 
-	
+	require_once ("../func_class/classes.php");
+
 	controle ("consulta");
-	echo "<style type='text/css'> <!--";
-	require_once ("style.css");
-	echo "</style>";
+?>
+<link rel="stylesheet" type="text/css" href="../css/bootstrap.print.css" />
+<link rel="icon" type="image/gif" href="../br_igreja.jpg">
+<?php
 }else {
-echo "<style type='text/css'> <!--";
-	require_once ("aniv/style.css");
 ?>
-</style>
 <script type="text/JavaScript">
 <!--
 function MM_jumpMenu(targ,selObj,restore){ //v3.0
@@ -26,33 +24,27 @@ function MM_jumpMenu(targ,selObj,restore){ //v3.0
 }
 //-->
 </script>
-
-<?PHP 
+<?PHP
 	require_once ("aniv/navega.php");
-} 
+}
 //Código para exibir de qual congregação é a lista de aniversariantes
 $congrega = new DBRecord ("igreja","{$_GET["congregacao"]}","rol");
 if ($_GET["congregacao"]>"0" ) {
 	$cong_sele = " - Congrega&ccedil;&atilde;o: ".$congrega->razao();
 }
 ?>
-
-
-<table cellspacing="0" class='table' id="playlistTable" summary="Top 15 songs played. Top artitst include Coldplay, Yeah Yeah Yeahs, Snow Patrol, Deeper Water, Kings of Leon, Embrace, Oasis, Franz Ferdinand, Jet, The Bees, Blue States, Kaiser Chiefs and Athlete.">
+<table class='table table-bordered table-striped' >
 <caption>
 Aniversariantes de Casamento
-<?PHP 
+<?PHP
 $aniv = new aniversario;
 
 if ($_GET["proxima"]=="" || $_GET["proxima"]=="0"){
 	echo " de Hoje";
 }else {
 	echo "do Dia: ".$aniv->data_consulta ();}
-
 ?>
- 
 </caption>
-
 <colgroup>
 <col id="PlaylistCol" />
 <col id="Anos" />
@@ -60,7 +52,6 @@ function MM_jumpMenu(targ,selObj,restore){ //v3.0
 <col id="Congrega" />
 <col id="albumCol" />
 </colgroup>
-
 <thead>
 <tr>
 <th id="" scope="col">Ano(s)</th>
@@ -81,13 +72,10 @@ function MM_jumpMenu(targ,selObj,restore){ //v3.0
 <th scope="col">Cargo</th>
 </tr>
 </thead>
-
 <tbody>
-
 <?PHP
 $aniv->casamento();
 ?>
 </tbody>
-
 </table>
-Voc&ecirc; pode ordenar por Rol, Nome e Congrega&ccedil;&atilde;o &quot;click&quot; no cabe&ccedil;alho. Por padr&atilde;o ele ordena pelo nome do membro. 
\ No newline at end of file
+Voc&ecirc; pode ordenar por Rol, Nome e Congrega&ccedil;&atilde;o &quot;click&quot; no cabe&ccedil;alho. Por padr&atilde;o ele ordena pelo nome do membro.
diff --git a/aniv/mes.php b/aniv/mes.php
index 6a2d135c..9de9f208 100755
--- a/aniv/mes.php
+++ b/aniv/mes.php
@@ -13,26 +13,12 @@
   // require_once '../views/modeloPrint.php';
 
 	controle ("consulta");
-	echo "<style type='text/css'> <!--";
-	require_once ("style.css");
-	echo "</style>";
 	?>
-	<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-	    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-	<html>
-	<head>
-	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
-	<title><?php echo $titTabela;?></title>
-	<link rel="stylesheet" type="text/css" href="../css/bootstrap.min.css" />
+	<link rel="stylesheet" type="text/css" href="../css/bootstrap.print.css" />
 	<link rel="icon" type="image/gif" href="../br_igreja.jpg">
-
 	<?php
 }else {
-echo "<style type='text/css'> <!--";
-	require_once ("aniv/style.css");
 ?>
-</style>
-
 <script type="text/JavaScript">
 <!--
 function MM_jumpMenu(targ,selObj,restore){ //v3.0
@@ -41,12 +27,10 @@ function MM_jumpMenu(targ,selObj,restore){ //v3.0
 }
 //-->
 </script>
-
 <?PHP
 	require_once ("aniv/navega.php");
 }
 $ord = intval($_GET["ord"]);
-
 // $ordDia = ($ord!=3) ? 3 : 4 ;
 if ($ord==3) {
   $ordDia = 4;
@@ -58,8 +42,6 @@ function MM_jumpMenu(targ,selObj,restore){ //v3.0
   $iconDia = '';
   $ordDia=3;
 }
-
-
 if ($ord==0) {
   $ordNome = 5;
   $iconNome = '<span class="glyphicon glyphicon-chevron-down text-danger" aria-hidden="true"></span>';
@@ -70,51 +52,39 @@ function MM_jumpMenu(targ,selObj,restore){ //v3.0
   $iconNome = '';
   $ordNome=0;
 }
-// echo $iconDia;
-// $ordNome = ($ord!=0) ? '' : 5 ;
-
 //Código para exibir de qual congregação é a lista de aniversariantes
 $congrega = new DBRecord ("igreja","{$_GET["congregacao"]}","rol");
 if ($_GET["congregacao"]>"0" ) {
 	$cong_sele = " - Congrega&ccedil;&atilde;o: ".$congrega->razao();
 }
 ?>
-
-<table class="table table-striped">
+<table class="table table-striped table-bordered">
 <caption>
 Aniversariantes do M&ecirc;s <?PHP echo $cong_sele;?>
 </caption>
-
 <colgroup>
 <col id="Dia" />
 <col id="Nome" />
 <col id="Data" />
 <col id="albumCol" />
 </colgroup>
-
 <thead>
 <tr>
-
 <th scope="col"><a href="./?escolha=aniv/mes.php&menu=top_aniv&ord=<?=$ordDia?>" title="Ordenar por Data">Dia
 <?=$iconDia?>
 </a></th>
-
 <th scope="col"><a href="./?escolha=aniv/mes.php&menu=top_aniv&ord=<?=$ordNome?>" title="Ordenar por nome">Nome
   <?=$iconNome?>
 </a></th>
-
 <th scope="col"><a href="./?escolha=aniv/mes.php&menu=top_aniv&ord=<?=$ordDia?>" title="Ordenar por Dia">Dia
   <?php echo $iconDia;?>
 </a></th>
-
 <th scope="col"><a href="./?escolha=aniv/mes.php&menu=top_aniv&ord=<?=$ordNome?>" title="Ordenar por nome">Nome
   <?=$iconNome?>
 </a></th>
 </tr>
 </thead>
-
 <tbody>
-
 <?PHP
 $aniv= new aniversario;
 $aniv->mes();
diff --git a/aniv/navega.php b/aniv/navega.php
index 74b95ad7..142c1ca0 100755
--- a/aniv/navega.php
+++ b/aniv/navega.php
@@ -11,11 +11,11 @@
       <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
+        <span class="glyphicon glyphicon-backward" aria-hidden="true"> </span> Voltar
      </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
+     ?>" type="button" class="btn btn-primary">Avan&ccedil;ar
      <span class="glyphicon glyphicon-forward" aria-hidden="true"> </span>
     </a>
     </div>
@@ -26,6 +26,22 @@
   		<option value="1">da Semana</option>
   		<option value="2">do M&ecirc;s</option>
   		</select>
+
+      <div class="btn-group">
+        <button type="button" class="btn btn-warning">Hoje</button>
+        <button type="button" class="btn btn-warning dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+          <span class="caret"></span>
+          <span class="sr-only">Toggle Dropdown</span>
+        </button>
+        <ul class="dropdown-menu">
+          <li><a href="#">hoje</a></li>
+          <li><a href="#">Semana</a></li>
+          <li><a href="#">M&ecirc;s</a></li>
+          <li role="separator" class="divider"></li>
+          <li><a href="#">Separated link</a></li>
+        </ul>
+      </div>
+
     </div>
     <div class="col-xs-4"><label>Igreja</label>
       <select name="igreja" id="igreja" class="form-control" onchange="MM_jumpMenu('parent',this,0)" tabindex="<?PHP echo ++$ind; ?>" >
@@ -38,8 +54,4 @@
   		</select>
     </div>
     </div>
-      <div class="col-xs-1"><label>&nbsp;</label>
-      <input type="submit" class="btn btn-primary" value='Listar!' >
-    </div>
-</div>
   </form>
diff --git a/aniv/semana.php b/aniv/semana.php
index 77ba5f6b..5f8ddfc6 100755
--- a/aniv/semana.php
+++ b/aniv/semana.php
@@ -1,5 +1,5 @@
 <?PHP
-  
+
 $anterior=$_GET["proxima"]-1;
 $proximo=$_GET["proxima"]+1;
 
@@ -7,11 +7,12 @@
 
 	session_start();
 	require_once ("../func_class/funcoes.php");
-	require_once ("../func_class/classes.php"); 
+	require_once ("../func_class/classes.php");
 	controle ("consulta");
-	echo "<style type='text/css'> <!--";
-	require_once ("style.css");
-	echo "</style>";
+  ?>
+  <link rel="stylesheet" type="text/css" href="../css/bootstrap.print.css" />
+  <link rel="icon" type="image/gif" href="../br_igreja.jpg">
+  <?php
 }else {
 echo "<style type='text/css'> <!--";
 	require_once ("aniv/style.css");
@@ -26,20 +27,19 @@ function MM_jumpMenu(targ,selObj,restore){ //v3.0
 //-->
 </script>
 
-<?PHP 
+<?PHP
 	require_once ("aniv/navega.php");
-} 
+}
 //Código para exibir de qual congregação é a lista de aniversariantes
 $congrega = new DBRecord ("igreja","{$_GET["congregacao"]}","rol");
 if ($_GET["congregacao"]>"0" ) {
 	$cong_sele = " - Congrega&ccedil;&atilde;o: ".$congrega->razao();
 }
 ?>
-<table cellspacing="0" id="playlistTable" class='table' summary="Top 15 songs played. Top artitst include Coldplay, Yeah Yeah Yeahs, Snow Patrol, Deeper Water, Kings of Leon, Embrace, Oasis, Franz Ferdinand, Jet, The Bees, Blue States, Kaiser Chiefs and Athlete.">
+<table class='table table-striped table-bordered'>
 <caption>
 Lista de Aniversariantes da Semana <?PHP echo $cong_sele;?>
 </caption>
-
 <colgroup>
 <col id="PlaylistCol" />
 <col id="Rol" />
@@ -47,19 +47,18 @@ function MM_jumpMenu(targ,selObj,restore){ //v3.0
 <col id="Congrega" />
 <col id="albumCol" />
 </colgroup>
-
 <thead>
 <tr>
 <th scope="col">
 <?PHP if ($_GET["Submit"]!=="Imprimir") {?>
-	<a href="./?escolha=aniv/semana.php&menu=top_aniv&ord=3&proxima=<?PHP echo $_GET["proxima"];?>&congregacao=<?PHP echo $_GET["congregacao"];?>" title="Ordenar por Data">Dia 
+	<a href="./?escolha=aniv/semana.php&menu=top_aniv&ord=3&proxima=<?PHP echo $_GET["proxima"];?>&congregacao=<?PHP echo $_GET["congregacao"];?>" title="Ordenar por Data">Dia
 	<?PHP if ($_GET["ord"]=="3") {?>
 	<img src="img/s_desc.png" width="11" height="9" border="0" />
 	<?PHP } ?>
 	</a>
 <?PHP
 	}else { echo "<strong>Dia</strong>"; }
-?> 
+?>
 
 </th>
 <th scope="col">
diff --git a/css/bootstrap.print.css b/css/bootstrap.print.css
index 3296b7b6..a238c147 100755
--- a/css/bootstrap.print.css
+++ b/css/bootstrap.print.css
@@ -188,9 +188,9 @@ th {
   a:visited {
     text-decoration: underline;
   }
-  a[href]:after {
+  /* a[href]:after {
     content: " (" attr(href) ")";
-  }
+  } */
   abbr[title]:after {
     content: " (" attr(title) ")";
   }
diff --git a/func_class/classes.php b/func_class/classes.php
index 5c947577..c4418592 100755
--- a/func_class/classes.php
+++ b/func_class/classes.php
@@ -1024,7 +1024,7 @@ function casamento() {
 	}
 
 	function batismo() {
-		echo "Data da consulta atual {$prox_dia}/{$this->mes}/{$this->ano}";
+		// echo "Data da consulta atual {$prox_dia}/{$this->mes}/{$this->ano}";
 		$this->sql_d_dia = mysql_query ($this->query." DATE_FORMAT(e.batismo_em_aguas,'%d/%m')='{$this->dia_consulta}' ".$this->query_fim) or die (mysql_error());
 		while($this->dados = mysql_fetch_array($this->sql_d_dia))
 		{