Merge pull request #6557 from portabilis/issue-6556

Corrige tela de calendário letivo

Merge pull request #6557 from portabilis/issue-6556
Corrige tela de calendário letivo
Paula Bonot · GitHub
2 parents 4f5e76dc 332df3ec
Showing 3 changed files with 11 additions and 13 deletions Show diff stats
ieducar/intranet/educar_calendario_ano_letivo_lst.php
ieducar/intranet/scripts/calendario.js
ieducar/intranet/styles/custom.css
@@ -17,7 +17,6 @@ class clsIndexBase extends clsBase
     function Formular()
     {
         $this->SetTitulo($this->_instituicao . ' i-Educar - Calendários');
-        $this->addScript('calendario');
         $this->processoAp = 620;
     }
 }
@@ -471,6 +470,12 @@ class indice extends clsListagem
  
       $retorno .= '</tbody> </table>';
  
+      $scripts = [
+        '/intranet/scripts/calendario.js'
+      ];
+
+      Portabilis_View_Helper_Application::loadJavascript($this, $scripts);
+
       return $retorno;
   }
 }
@@ -65,18 +65,6 @@ function updateMessagePosition()
   last.style.top  = (findPosY(last_td) + 2) + 'px';
 }
  
-if (document.createStyleSheet) {
-  document.createStyleSheet('styles/calendario.css');
-}
-else {
-  var objHead = document.getElementsByTagName('head');
-  var objCSS = objHead[0].appendChild(document.createElement('link'));
-
-  objCSS.rel  = 'stylesheet';
-  objCSS.href = 'styles/calendario.css';
-  objCSS.type = 'text/css';
-}
-
 var cX = 0;
 var cY = 0;
  
@@ -492,6 +492,11 @@ table.calendar .dayLastMonth, .day{
  
 table.calendar .day{
   background-color: #e9f0f8 !;
+  cursor: pointer;
+}
+
+table.calendar .day:hover{
+  opacity: .7;
 }
  
 table.calendar .anotacao{
...	...	@@ -17,7 +17,6 @@ class clsIndexBase extends clsBase
17	17	function Formular()
18	18	{
19	19	$this->SetTitulo($this->_instituicao . ' i-Educar - Calendários');
20		- $this->addScript('calendario');
21	20	$this->processoAp = 620;
22	21	}
23	22	}
...	...	@@ -471,6 +470,12 @@ class indice extends clsListagem
471	470
472	471	$retorno .= '</tbody> </table>';
473	472
	473	+ $scripts = [
	474	+ '/intranet/scripts/calendario.js'
	475	+ ];
	476	+
	477	+ Portabilis_View_Helper_Application::loadJavascript($this, $scripts);
	478	+
474	479	return $retorno;
475	480	}
476	481	}
...	...
...	...	@@ -65,18 +65,6 @@ function updateMessagePosition()
65	65	last.style.top = (findPosY(last_td) + 2) + 'px';
66	66	}
67	67
68		-if (document.createStyleSheet) {
69		- document.createStyleSheet('styles/calendario.css');
70		-}
71		-else {
72		- var objHead = document.getElementsByTagName('head');
73		- var objCSS = objHead[0].appendChild(document.createElement('link'));
74		-
75		- objCSS.rel = 'stylesheet';
76		- objCSS.href = 'styles/calendario.css';
77		- objCSS.type = 'text/css';
78		-}
79		-
80	68	var cX = 0;
81	69	var cY = 0;
82	70
...	...
...	...	@@ -492,6 +492,11 @@ table.calendar .dayLastMonth, .day{
492	492
493	493	table.calendar .day{
494	494	background-color: #e9f0f8 !;
	495	+ cursor: pointer;
	496	+}
	497	+
	498	+table.calendar .day:hover{
	499	+ opacity: .7;
495	500	}
496	501
497	502	table.calendar .anotacao{
...	...