Skip to content

Commit

Permalink
Arvore funcionando e outras correcoes
Browse files Browse the repository at this point in the history
  • Loading branch information
@guaycuru
guaycuru committed Mar 29, 2017
1 parent c49388f commit f50c6ce
Show file tree
Hide file tree
Showing 5 changed files with 36 additions and 17 deletions.
15 changes: 9 additions & 6 deletions classes/GDE/Arvore.inc.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -690,7 +690,7 @@ public function Mapa($meu = true) {

$mapa = "";
foreach($mapas as $sigla => $dados)
$mapa .= "<area shape='rect' coords='".implode(",", $dados[1])."' title='".$dados[0]."' alt='".$dados[0]."' href='".(($meu === true)?"#":CONFIG_URL."disciplina/".$sigla."' target='_blank'")."' id='Shape_".str_replace(" ", "_", $sigla)."' class='Shapes' />";
$mapa .= "<area shape='rect' coords='".implode(",", $dados[1])."' title='".$dados[0]."' alt='".$dados[0]."' href='".(($meu === true)?"#":CONFIG_URL."disciplina/".$sigla."/' target='_blank'")."' id='Shape_".str_replace(" ", "_", $sigla)."' class='Shapes' />";
return $mapa;
}

Expand Down Expand Up @@ -754,7 +754,7 @@ public function RMenu($meu = true) {
$menus .= "<div id=\"Menu_".str_replace(" ", "_", $Disciplina->getSigla(true))."\" style=\"display:none;\" class=\"RMenu\">
<ul>
<li>".$Disciplina->getNome()."</li>
<li><a href=\"".CONFIG_URL."disciplina/".$Disciplina->getSigla(true)."\" target=\"_blank\">Informa&ccedil;&otilde;es</a></li>
<li><a href=\"".CONFIG_URL."disciplina/".$Disciplina->getSigla(true)."/\" target=\"_blank\">Informa&ccedil;&otilde;es</a></li>
<li><a href=\"#\" onclick=\"Elimina('".$Disciplina->getSigla(true)."', 0 ,0); return false;\">Eliminar Normalmente</a></li>
<li><a href=\"#\" onclick=\"Elimina('".$Disciplina->getSigla(true)."', 1 ,0); return false;\">Eliminar Parcialmente</a></li>
<li><a href=\"#\" onclick=\"Elimina('".$Disciplina->getSigla(true)."', 0 ,1); return false;\">Eliminar Por Profici&ecirc;ncia</a></li>
Expand Down Expand Up @@ -800,7 +800,8 @@ public function Historico() {
if(substr($sigla, 0, 2) == 'AA')
continue;
$i++;
$ret .= " <a href=\"".CONFIG_URL."disciplina/".$sigla."\" class=\"sigla\" title=\"".$Eliminada->getDisciplina(true)->getNome(true)."\">".$sigla."</a>(".(sprintf("%02d", $Eliminada->getDisciplina(true)->getCreditos(true))).")".$this->getTipo($sigla, true).' '.$Eliminada->getPeriodo()->getNome(true); // MC102S06+ 9,2150 4 1S07
$url = Disciplina::URL_Disciplina($sigla);
$ret .= " <a href=\"".$url."\" class=\"sigla\" title=\"".$Eliminada->getDisciplina(true)->getNome(true)."\" target=\"_blank\">".$sigla."</a>(".(sprintf("%02d", $Eliminada->getDisciplina(true)->getCreditos(true))).")".$this->getTipo($sigla, true).' '.$Eliminada->getPeriodo()->getNome(true); // MC102S06+ 9,2150 4 1S07
if($i % 4 == 0) $ret .= "<br />"; // normal eh 3
}

Expand All @@ -812,7 +813,8 @@ public function Historico() {
foreach($Deste_Semestre as $Disciplina) {
$sigla = $Disciplina->getSigla(true);
if(($sigla != 'ELET') && ($sigla != 'LING') && (in_array($sigla, $this->siglas_atuais) === false)) {
$ret .= " <a href=\"".CONFIG_URL."disciplina/".$Disciplina->getSigla(true)."\" class=\"sigla\" title=\"".$Disciplina->getNome(true)."\">".$Disciplina->getSigla(true)."</a>(".(sprintf("%02d", $Disciplina->getCreditos(false))).")";
$url = Disciplina::URL_Disciplina($Disciplina->getSigla(false));
$ret .= " <a href=\"".$url."\" class=\"sigla\" title=\"".$Disciplina->getNome(true)."\" target=\"_blank\">".$Disciplina->getSigla(true)."</a>(".(sprintf("%02d", $Disciplina->getCreditos(false))).")";
$i++;
if($i % 7 == 0) $ret .= "\r\n";
}
Expand All @@ -832,7 +834,8 @@ public function Historico() {
//$ret .= "\r\n OBTER ".(($creditos<10)?' ':null).$creditos." CREDITO(S) DENTRE";
$ret .= " Obter ".(($creditos<10)?' ':null).$creditos." Cr&eacute;dito(s) dentre a(s) seguinte(s) disciplina(s): ";
foreach($Elet->getConjuntos() as $Falta) {
$ret .= " <a href=\"".CONFIG_URL."disciplina/".$Falta->getSigla(true)."\" class=\"sigla\" title=\"".$Falta->getDisciplina()->getNome(true)."\">".$Falta->getSigla(true)."</a>(".(($Falta->getDisciplina()->getCreditos() > 0)?(sprintf("%02d", $Falta->getDisciplina()->getCreditos(false))):'??').")";
$url = Disciplina::URL_Disciplina($Falta->getSigla(false));
$ret .= " <a href=\"".$url."\" class=\"sigla\" title=\"".$Falta->getDisciplina()->getNome(true)."\" target=\"_blank\">".$Falta->getSigla(true)."</a>(".(($Falta->getDisciplina()->getCreditos() > 0)?(sprintf("%02d", $Falta->getDisciplina()->getCreditos(false))):'??').")";
$i++;
if($i % 5 == 0) $ret .= "\r\n ";
}
Expand All @@ -846,7 +849,7 @@ public function Historico() {
if($this->completa === false) {
$i = 0;
foreach($this->Atuais as $Atual) {
$ret .= " <a href=\"".CONFIG_URL."oferecimento/".$Atual->getID()."\" class=\"sigla\" title=\"".$Atual->getDisciplina(true)->getNome()."\">".$Atual->getDisciplina(true)->getSigla(true).$Atual->getTurma(true)."</a>(".(sprintf("%02d", $Atual->getDisciplina(true)->getCreditos(false))).")".$this->getTipo($Atual->getSigla(true), true);
$ret .= " <a href=\"".CONFIG_URL."oferecimento/".$Atual->getID()."\" class=\"sigla\" title=\"".$Atual->getDisciplina(true)->getNome()."\" target=\"_blank\">".$Atual->getDisciplina(true)->getSigla(true).$Atual->getTurma(true)."</a>(".(sprintf("%02d", $Atual->getDisciplina(true)->getCreditos(false))).")".$this->getTipo($Atual->getSigla(true), true);
$i++;
if($i % 6 == 0) $ret .= "\r\n";
}
Expand Down
22 changes: 20 additions & 2 deletions classes/GDE/Disciplina.inc.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,10 @@ public static function Consultar($param, $ordem = null, &$total = null, $limit =
if($ordem == null)
$ordem = "D.sigla ASC";
if(isset($param['sigla'])) {
if(strlen($param['sigla']) == 5)
if(strpos($param['sigla'], '-') !== false) {
$qrs[] = "D.sigla LIKE :sigla";
$param['sigla'] = preg_replace('/[\-]+/', '%', $param['sigla']);
} elseif(strlen($param['sigla']) == 5)
$qrs[] = "D.sigla = :sigla";
else {
$qrs[] = "D.sigla LIKE :sigla";
Expand Down Expand Up @@ -359,7 +362,22 @@ public static function Formata_Conjuntos($Conjuntos) {
return implode(" ou<br />", $ret);
}

public function getNome($html = false) {
/**
* @param $sigla
* @return string
*/
public static function URL_Disciplina($sigla) {
return CONFIG_URL.((strpos($sigla, '-') === false)
? 'disciplina/'.urlencode($sigla).'/'
: 'busca/?t=tab_disciplinas&sigla='.urlencode($sigla).'&buscar#tab_disciplinas');
}

/**
* @param bool $html
* @param bool $vazio
* @return string
*/
public function getNome($html = false, $vazio = false) {
$nome = parent::getNome($html);
if(($nome == null) && ($html))
return self::NOME_VAZIO;
Expand Down
8 changes: 4 additions & 4 deletions views/arvore.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,15 +130,15 @@ function TrazDoCache($params) {
$('#select_modalidade').load('<?= CONFIG_URL; ?>ajax/modalidades.php?c='+$('#curso').val()+'&a='+$('#catalogo').val()+'&o=1', {}, function(){
$('#select_modalidade').removeClass("ac_loading");
});
}
};
manda_form = function() {
document.location = '<?= CONFIG_URL; ?>arvore/?curso='+$("#curso").val()+'&modalidade='+$("#modalidade").val()+'&catalogo='+$("#catalogo").val()+'&cp='+$("#cp").val();
}
};
limpa_form = function() {
document.location = '<?= CONFIG_URL; ?>arvore/';
}
};
Elimina = function(sigla, a, r) {
$.post('<?= CONFIG_URL; ?>ajax/ax_disciplina.php', {sigla: sigla, e: '1', a: a, r: r, v: '1'}, function() {
$.post('<?= CONFIG_URL; ?>ajax/disciplina.php', {sigla: sigla, e: '1', a: a, r: r, v: '1'}, function() {
history.go(0);
});
}
Expand Down
2 changes: 1 addition & 1 deletion views/busca.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
} else { // Busca Avancada
$simples = false;
$q = null;
$tp = htmlspecialchars($_GET['t']);
$tp = (!empty($_GET['t'])) ? htmlspecialchars($_GET['t']) : 'tudo';
}
} else {
$buscar = false;
Expand Down
6 changes: 2 additions & 4 deletions views/disciplina.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
if(empty($_GET['id']))
die("Cad&ecirc; a sigla da Disciplina?".$FIM);

$Disciplina = Disciplina::Por_Sigla($_GET['id']);
$Disciplina = Disciplina::Por_Sigla($_GET['id'], null, false);
if($Disciplina === null)
die("Disciplina não encontrada!".$FIM);

Expand Down Expand Up @@ -40,7 +40,6 @@
}

?>
<!-- <script type="text/javascript" src="<?= CONFIG_URL; ?>web/js/gde.forum.js?<?= REVISION; ?>"></script> -->
<script type="text/javascript">
// <![CDATA[
var carregou_oferecimentos = false;
Expand Down Expand Up @@ -119,7 +118,6 @@
<li><a href="#tab_informacoes" class="ativo">Informa&ccedil;&otilde;es</a></li>
<li><a href="#tab_curso">Curso</a></li>
<li><a href="#tab_oferecimentos">Oferecimentos</a></li>
<!-- <li><a href="#tab_forum">F&oacute;rum</a></li> -->
<!-- <li><a href="#tab_professores">Professores</a></li> -->
</ul>
<div id="tab_informacoes" class="tab_content">
Expand All @@ -136,7 +134,7 @@
<td width="25%"><b>N&iacute;vel:</b></td>
<td><?=$Disciplina->getNivel(true); ?></td>
</tr>
<?php if($Disciplina->getInstituto()->getNome() != null) { ?>
<?php if($Disciplina->getInstituto(false) !== null) { ?>
<tr>
<td width="25%"><b>Instituto:</b></td>
<td><?=$Disciplina->getInstituto(true)->getNome(true); ?> (<?=$Disciplina->getInstituto(true)->getSigla(true); ?>)</td>
Expand Down

0 comments on commit f50c6ce

Please sign in to comment.