aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorM.Gergo2020-03-23 01:17:58 +0100
committerM.Gergo2020-03-23 01:17:58 +0100
commit31bf036be3be01ef7b3bbc9dc08813f0740dab9a (patch)
treef149b4cd7ee31e5e85b20e9b2e6317af6e7ae465
parenta7992b5395dab0da64527b8cc6357709196663d2 (diff)
downloadmayor-31bf036be3be01ef7b3bbc9dc08813f0740dab9a.tar.gz
mayor-31bf036be3be01ef7b3bbc9dc08813f0740dab9a.zip
Rev: 4630rev4630
-rw-r--r--mayor-orig/mayor-base/log/mayor-base.rev2
-rw-r--r--mayor-orig/mayor-felveteli/log/mayor-felveteli.rev2
-rw-r--r--mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev2
-rw-r--r--mayor-orig/mayor-installer-orig/log/mayor-installer.rev2
-rw-r--r--mayor-orig/mayor-installer-sulix/log/mayor-installer-sulix.rev2
-rw-r--r--mayor-orig/mayor-jatek/log/mayor-jatek.rev2
-rw-r--r--mayor-orig/mayor-locales-de_DE/log/mayor-locales-de_DE.rev2
-rw-r--r--mayor-orig/mayor-locales-en_US/log/mayor-locales-en_US.rev2
-rw-r--r--mayor-orig/mayor-locales-jp_JP/log/mayor-locales-jp_JP.rev2
-rw-r--r--mayor-orig/mayor-naplo/install/module-naplo/mysql/tanev.sql14
-rw-r--r--mayor-orig/mayor-naplo/log/mayor-naplo.rev2
-rw-r--r--mayor-orig/mayor-naplo/update/pre004627-1-naplo.sql29
-rw-r--r--mayor-orig/mayor-naplo/www/include/modules/naplo/haladasi/haladasi.php1
-rw-r--r--mayor-orig/mayor-naplo/www/include/modules/naplo/share/ora.php18
-rw-r--r--mayor-orig/mayor-naplo/www/policy/private/naplo/haladasi/haladasi-pre.php3
-rw-r--r--mayor-orig/mayor-naplo/www/policy/private/naplo/haladasi/hazifeladat-pre.php32
-rw-r--r--mayor-orig/mayor-naplo/www/policy/private/naplo/orarend/orarend-pre.php2
-rw-r--r--mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/haladasi/hazifeladat.css31
-rw-r--r--mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/haladasi.phtml7
-rw-r--r--mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/hazifeladat.phtml50
-rw-r--r--mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/orarend/orarend.phtml6
-rw-r--r--mayor-orig/mayor-portal/log/mayor-portal.rev2
-rw-r--r--mayor-orig/mayor-wiki/log/mayor-wiki.rev2
-rw-r--r--mayor-orig/md5sum26
-rw-r--r--mayor-orig/rev.txt2
-rw-r--r--rev.txt2
26 files changed, 208 insertions, 39 deletions
diff --git a/mayor-orig/mayor-base/log/mayor-base.rev b/mayor-orig/mayor-base/log/mayor-base.rev
index cebe3996..686eea15 100644
--- a/mayor-orig/mayor-base/log/mayor-base.rev
+++ b/mayor-orig/mayor-base/log/mayor-base.rev
@@ -1 +1 @@
-4627
+4630
diff --git a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
index cebe3996..686eea15 100644
--- a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
+++ b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
@@ -1 +1 @@
-4627
+4630
diff --git a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
index cebe3996..686eea15 100644
--- a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
+++ b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
@@ -1 +1 @@
-4627
+4630
diff --git a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
index cebe3996..686eea15 100644
--- a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
+++ b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
@@ -1 +1 @@
-4627
+4630
diff --git a/mayor-orig/mayor-installer-sulix/log/mayor-installer-sulix.rev b/mayor-orig/mayor-installer-sulix/log/mayor-installer-sulix.rev
index cebe3996..686eea15 100644
--- a/mayor-orig/mayor-installer-sulix/log/mayor-installer-sulix.rev
+++ b/mayor-orig/mayor-installer-sulix/log/mayor-installer-sulix.rev
@@ -1 +1 @@
-4627
+4630
diff --git a/mayor-orig/mayor-jatek/log/mayor-jatek.rev b/mayor-orig/mayor-jatek/log/mayor-jatek.rev
index cebe3996..686eea15 100644
--- a/mayor-orig/mayor-jatek/log/mayor-jatek.rev
+++ b/mayor-orig/mayor-jatek/log/mayor-jatek.rev
@@ -1 +1 @@
-4627
+4630
diff --git a/mayor-orig/mayor-locales-de_DE/log/mayor-locales-de_DE.rev b/mayor-orig/mayor-locales-de_DE/log/mayor-locales-de_DE.rev
index cebe3996..686eea15 100644
--- a/mayor-orig/mayor-locales-de_DE/log/mayor-locales-de_DE.rev
+++ b/mayor-orig/mayor-locales-de_DE/log/mayor-locales-de_DE.rev
@@ -1 +1 @@
-4627
+4630
diff --git a/mayor-orig/mayor-locales-en_US/log/mayor-locales-en_US.rev b/mayor-orig/mayor-locales-en_US/log/mayor-locales-en_US.rev
index cebe3996..686eea15 100644
--- a/mayor-orig/mayor-locales-en_US/log/mayor-locales-en_US.rev
+++ b/mayor-orig/mayor-locales-en_US/log/mayor-locales-en_US.rev
@@ -1 +1 @@
-4627
+4630
diff --git a/mayor-orig/mayor-locales-jp_JP/log/mayor-locales-jp_JP.rev b/mayor-orig/mayor-locales-jp_JP/log/mayor-locales-jp_JP.rev
index cebe3996..686eea15 100644
--- a/mayor-orig/mayor-locales-jp_JP/log/mayor-locales-jp_JP.rev
+++ b/mayor-orig/mayor-locales-jp_JP/log/mayor-locales-jp_JP.rev
@@ -1 +1 @@
-4627
+4630
diff --git a/mayor-orig/mayor-naplo/install/module-naplo/mysql/tanev.sql b/mayor-orig/mayor-naplo/install/module-naplo/mysql/tanev.sql
index eeaca556..59ee0c39 100644
--- a/mayor-orig/mayor-naplo/install/module-naplo/mysql/tanev.sql
+++ b/mayor-orig/mayor-naplo/install/module-naplo/mysql/tanev.sql
@@ -152,6 +152,20 @@ CREATE TABLE `oraHazifeladat` (
CONSTRAINT `oraHazifeladat_ibfk_1` FOREIGN KEY (`oraId`) REFERENCES `ora` (`oraId`) ON DELETE CASCADE ON UPDATE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_hungarian_ci;
+CREATE TABLE `oraHazifeladatDiak` (
+ `hazifeladatId` int(10) unsigned NOT NULL DEFAULT '0',
+ `diakId` int(10) unsigned NOT NULL DEFAULT '0',
+ `diakLattamDt` datetime DEFAULT NULL,
+ `tanarLattamDt` datetime DEFAULT NULL,
+ `hazifeladatDiakStatus` enum('','kész') COLLATE utf8_hungarian_ci DEFAULT '',
+ `hazifeladatDiakMegjegyzes` varchar(255) COLLATE utf8_hungarian_ci NOT NULL,
+ PRIMARY KEY (`hazifeladatId`,`diakId`),
+ UNIQUE KEY `oraHazifeladatDiak_UK` (`hazifeladatId`,`diakId`),
+ KEY `oraHazifeladatDiak_ibfk_2` (`diakId`),
+ CONSTRAINT `oraHazifeladatDiak_ibfk_1` FOREIGN KEY (`hazifeladatId`) REFERENCES `oraHazifeladat` (`hazifeladatId`) ON DELETE CASCADE ON UPDATE CASCADE,
+ CONSTRAINT `oraHazifeladatDiak_ibfk_2` FOREIGN KEY (`diakId`) REFERENCES `%DB%`.`diak` (`diakId`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_hungarian_ci;
+
CREATE TABLE `orarendiOraTankor` (
`tanarId` int(10) unsigned NOT NULL,
`osztalyJel` varchar(7) COLLATE utf8_bin NOT NULL,
diff --git a/mayor-orig/mayor-naplo/log/mayor-naplo.rev b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
index cebe3996..686eea15 100644
--- a/mayor-orig/mayor-naplo/log/mayor-naplo.rev
+++ b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
@@ -1 +1 @@
-4627
+4630
diff --git a/mayor-orig/mayor-naplo/update/pre004627-1-naplo.sql b/mayor-orig/mayor-naplo/update/pre004627-1-naplo.sql
new file mode 100644
index 00000000..ba6686cd
--- /dev/null
+++ b/mayor-orig/mayor-naplo/update/pre004627-1-naplo.sql
@@ -0,0 +1,29 @@
+DELIMITER $$
+DROP PROCEDURE IF EXISTS upgrade_database_4627 $$
+
+CREATE PROCEDURE upgrade_database_4627()
+BEGIN
+SET NAMES utf8 COLLATE utf8_hungarian_ci;
+
+IF NOT EXISTS (
+ SELECT * FROM information_schema.TABLES WHERE TABLE_SCHEMA=DATABASE() and TABLE_NAME='oraHazifeladatDiak'
+) THEN
+
+CREATE TABLE `oraHazifeladatDiak` (
+ `hazifeladatId` int(10) unsigned DEFAULT NULL,
+ `diakId` int(10) unsigned DEFAULT NULL,
+ `diakLattamDt` datetime DEFAULT NULL,
+ `tanarLattamDt` datetime DEFAULT NULL,
+ `hazifeladatDiakStatus` ENUM('','kész') DEFAULT '',
+ `hazifeladatDiakMegjegyzes` varchar(255) COLLATE utf8_hungarian_ci NOT NULL,
+ PRIMARY KEY (`hazifeladatId`,`diakId`),
+ UNIQUE KEY `oraHazifeladatDiak_UK` (`hazifeladatId`,`diakId`),
+ CONSTRAINT `oraHazifeladatDiak_ibfk_1` FOREIGN KEY (`hazifeladatId`) REFERENCES `oraHazifeladat` (`hazifeladatId`) ON DELETE CASCADE ON UPDATE CASCADE,
+ CONSTRAINT `oraHazifeladatDiak_ibfk_2` FOREIGN KEY (`diakId`) REFERENCES %INTEZMENYDB%.`diak` (`diakId`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_hungarian_ci;
+
+END IF;
+
+END $$
+DELIMITER ;
+CALL upgrade_database_4627();
diff --git a/mayor-orig/mayor-naplo/www/include/modules/naplo/haladasi/haladasi.php b/mayor-orig/mayor-naplo/www/include/modules/naplo/haladasi/haladasi.php
index 0be1c61a..92d07ee8 100644
--- a/mayor-orig/mayor-naplo/www/include/modules/naplo/haladasi/haladasi.php
+++ b/mayor-orig/mayor-naplo/www/include/modules/naplo/haladasi/haladasi.php
@@ -134,6 +134,7 @@
$v = array($sor['oraId']);
$sor['cimke'] = db_query($q, array('fv' => 'getHaladasi/cimkek', 'modul' => 'naplo', 'result' => 'idonly', 'values' => $v), $lr);
}
+
$ret[$sor['dt']][] = $sor;
}
// Nap információk lekérdezése
diff --git a/mayor-orig/mayor-naplo/www/include/modules/naplo/share/ora.php b/mayor-orig/mayor-naplo/www/include/modules/naplo/share/ora.php
index 7c4c4b4e..602f26e1 100644
--- a/mayor-orig/mayor-naplo/www/include/modules/naplo/share/ora.php
+++ b/mayor-orig/mayor-naplo/www/include/modules/naplo/share/ora.php
@@ -371,7 +371,7 @@ WHERE dt>='%s' and dt<='%s' AND (ki=%u OR kit=%u) $WHERE ORDER BY dt,ora";
return $RESULT;
}
- function getOrak($TANKORIDK, $SET=array('tolDt'=>'','igDt'=>'', 'result'=>'likeOrarend', 'elmaradokNelkul'=>false)) {
+ function getOrak($TANKORIDK, $SET=array('tolDt'=>'','igDt'=>'', 'result'=>'likeOrarend', 'elmaradokNelkul'=>false, 'diakId'=>null)) {
/* FIGYELEM! A függvény feltételezi, hogy az átadott tankoridkben az adott intervallumon helyes adatok szerepelnek!
-- problémát okozhat, ha hosszú intervallumot adunk meg!!! -- lásd FS#100 */
@@ -404,6 +404,12 @@ WHERE dt>='%s' and dt<='%s' AND tankorId IN (".implode(',', array_fill(0, count(
$_put['oo'] = false;
$RE['orak'][$R[$i]['dt']][$R[$i]['ora']][$R[$i]['tankorId']] = $_put;
if (!in_array($R[$i]['tankorId'],$RE['tankorok'])) $RE['tankorok'][] = intval($R[$i]['tankorId']);
+ if ($R[$i]['hazifeladatId']>0) {
+ if ($SET['diakId']>0) {
+ $diakHazifeladat = getDiakHazifeladatByOraIds(array($R[$i]['oraId']) , $SET['diakId']);
+ $RE['orak'][$R[$i]['dt']][$R[$i]['ora']][$R[$i]['tankorId']]['diakHazifeladat'] = $diakHazifeladat[$R[$i]['oraId']];
+ }
+ }
}
}
return $RE;
@@ -641,5 +647,15 @@ WHERE dt>='%s' and dt<='%s' AND tankorId IN (".implode(',', array_fill(0, count(
}
}
+ function getDiakHazifeladatByOraIds($oraIdk,$diakId,$olr='') {
+ $R = array();
+ if (count($oraIdk)>0 && $diakId>0) {
+ $q = "SELECT * FROM oraHazifeladat LEFT JOIN oraHazifeladatDiak USING (hazifeladatId) WHERE diakId=%u AND oraId IN (".implode(',',$oraIdk).")";
+ $v = array($diakId);
+ $R = db_query($q,array('debug'=>false,'fv'=>'getDiakhazifeladatByOraIds','modul'=>'naplo','values'=>$v,'result'=>'assoc','keyfield'=>'oraId'),$olr);
+ }
+ return $R;
+ }
+
?>
diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/haladasi/haladasi-pre.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/haladasi/haladasi-pre.php
index 9b397670..a7c57b7f 100644
--- a/mayor-orig/mayor-naplo/www/policy/private/naplo/haladasi/haladasi-pre.php
+++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/haladasi/haladasi-pre.php
@@ -361,6 +361,9 @@ if ( $skin == 'ajax'
}
}
$ADAT['oraLatogatasok'] = getOralatogatasByOraIds($ADAT['ORAIDK']);
+ if (__DIAK===true && $diakId>0) {
+ $ADAT['diakHazifeladat'] = getDiakHazifeladatByOraIds($ADAT['ORAIDK'],$diakId);
+ }
foreach ($ADAT['oraLatogatasok'] as $olId => $olAdat)
foreach ($olAdat['tanarIds'] as $_tanarId) $ADAT['oraLatogatasok'][$olId]['tanarNevek'][] = getTanarNevById($_tanarId);
// Kell a munkaterv!! Ahhoz kell(enek) az osztály(ok)!
diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/haladasi/hazifeladat-pre.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/haladasi/hazifeladat-pre.php
index ba0a27c4..28a02d5a 100644
--- a/mayor-orig/mayor-naplo/www/policy/private/naplo/haladasi/hazifeladat-pre.php
+++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/haladasi/hazifeladat-pre.php
@@ -23,7 +23,7 @@
$ADAT['oraId' ] = $oraId = readVariable($_POST['oraId'],'id',readVariable($_GET['oraId'],'id'));
// $ADAT['hazifeladatId' ] = $hazifeladatId = readVariable($_POST['hazifeladatId'],'id', readVariable($_GET['hazifeladatId'],'id'));
$ADAT['hazifeladatLeiras' ] = readVariable($_POST['hazifeladatLeiras'],'string');
- $action = readVariable($_POST['action'],'strictstring',null,array('hazifeladatBeiras'));
+ $action = readVariable($_POST['action'],'strictstring',null,array('hazifeladatBeiras','hazifeladatKesz'));
$q = "SELECT hazifeladatId FROM oraHazifeladat WHERE oraId=%u";
$values = array($ADAT['oraId']);
@@ -46,13 +46,41 @@
$leiras = readVariable($_POST['oraLeiras'],'string');
updateHaladasiNaploOra($oraId, $leiras);
}
+ } elseif (__DIAK===true) {
+ if (defined('__USERDIAKID') && __USERDIAKID>0) {
+ $diakId=__USERDIAKID;
+ } elseif (defined('__SZULODIAKID') && __SZULODIAKID>0) {
+ $diakId=__SZULODIAKID;
+ }
+ if ($diakId>0) {
+ $q = "INSERT IGNORE INTO oraHazifeladatDiak (hazifeladatId,diakId,diakLattamDt) VALUES (%u,%u,NOW())";
+ $values = array($ADAT['hazifeladatId'], $diakId);
+ db_query($q, array('modul'=>'naplo','result'=>'insert','values'=>$values));
+
+ if ($action=='hazifeladatKesz') {
+ if ($diakId>0 && $ADAT['hazifeladatId']>0) {
+ $q = "UPDATE oraHazifeladatDiak SET hazifeladatDiakStatus=IF(hazifeladatDiakStatus='','kész','') WHERE hazifeladatId=%u AND diakId=%u";
+ $values = array($ADAT['hazifeladatId'], $diakId);
+ db_query($q, array('modul'=>'naplo','result'=>'update','values'=>$values));
+ }
+ }
+ $q = "SELECT * FROM oraHazifeladatDiak WHERE hazifeladatId=%u AND diakId=%u";
+ $values = array($ADAT['hazifeladatId'],$diakId);
+ $ADAT['hazifeladatDiak'] = db_query($q, array('modul'=>'naplo','result'=>'record','values'=>$values));
+ }
+
}
$q = "SELECT * FROM oraHazifeladat WHERE oraId=%u";
$values = array($ADAT['oraId']);
$ADAT['hazifeladatAdat'] = db_query($q, array('modul'=>'naplo','result'=>'record','values'=>$values));
- $ADAT['oraAdat'] = getOraadatById($oraId);
+ if (__TANAR===true || __NAPLOADMIN===true || __VEZETOSEG===true) {
+ $q = "SELECT *,getNev(diakId,'diak') AS diakNev FROM oraHazifeladatDiak WHERE hazifeladatId=%u ORDER BY diakNev";
+ $values = array($ADAT['hazifeladatId']);
+ $ADAT['hazifeladatDiak'] = db_query($q, array('debug'=>true,'modul'=>'naplo','result'=>'indexed','values'=>$values));
+ }
+ $ADAT['oraAdat'] = getOraadatById($oraId);
$TOOL['vissza'] = array('tipus'=>'vissza',
'paramName'=>'vissza',
diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/orarend/orarend-pre.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/orarend/orarend-pre.php
index 6421687a..c56b6d87 100644
--- a/mayor-orig/mayor-naplo/www/policy/private/naplo/orarend/orarend-pre.php
+++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/orarend/orarend-pre.php
@@ -191,7 +191,7 @@
if ($teremId!='')
$_D = getOrakByTeremId($teremId,array('tolDt'=>$_dt,'igDt'=>$_dt,'result'=>'likeOrarend'));
else
- $_D = getOrak($TANKOROK['haladasi'],array('tolDt'=>$_dt,'igDt'=>$_dt,'result'=>'likeOrarend'));
+ $_D = getOrak($TANKOROK['haladasi'],array('tolDt'=>$_dt,'igDt'=>$_dt,'result'=>'likeOrarend','diakId'=>$diakId));
$ADAT['haladasi']['orak'][$_dt] = $_D['orak'][$_dt];
if (is_array($_D['tankorok'])) $ADAT['haladasi']['tankorok'] = array_map('intval',array_unique(array_merge($_D['tankorok'],$ADAT['haladasi']['tankorok'])));
}
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/haladasi/hazifeladat.css b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/haladasi/hazifeladat.css
new file mode 100644
index 00000000..1cce1e3e
--- /dev/null
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/haladasi/hazifeladat.css
@@ -0,0 +1,31 @@
+
+ fieldset.adatok { margin-bottom:1em; width:80%; margin-left:auto; margin-right:auto; border-radius: 2px; border: solid 1px #ddd;}
+ fieldset.adatok legend { border-radius: 2px; background-color: #ff5722; color:white; padding: 2px 4px; }
+
+ fieldset.adatok.kesz legend { background-color:lightgreen}
+
+ form button.btnHfStatusz {
+ background-color: #eee;
+ border-radius: 2px;
+ border: solid 1px #888;
+ color: #888;
+ padding:2px 18px 2px 4px;
+ }
+ form button.btnHfStatusz span { color:#eee; }
+ form button.btnHfStatusz.kesz span { color: lightgreen; }
+
+ form button.btnHfStatusz:hover {
+ background-color:lightgreen;
+ color:black;
+ border-color:black;
+ }
+ form button.btnHfStatusz.kesz:hover {
+ background-color: orange;
+ }
+ form button.btnHfStatusz:hover span { color: white; }
+
+ form button.btnHfStatusz.kesz:hover span { color: orange }
+
+ table.hazifeladatDiak { margin:auto; background-color: #eee;}
+ table.hazifeladatDiak thead tr th { background-color: #4caf50; color:white; font-weight:normal;}
+ table.hazifeladatDiak tbody tr td { background-color: white; font-weight:normal; padding: 2px 4px;}
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/haladasi.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/haladasi.phtml
index 3c36e9f2..e267cf27 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/haladasi.phtml
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/haladasi.phtml
@@ -528,7 +528,12 @@
}
echo '<a href="'.href('index.php?page=naplo&sub=haladasi&f=hazifeladat&oraId='.$dOra['oraId'].'&hazifeladatId='.$ADAT['tankorHazifeladat'][ $dOra['oraId'] ]).'" class="onClickUpdateWindow" title="'._HAZIFELADAT.'">';
if ($dOra['hazifeladatId']>0) {
- echo '<span class="icon-home-alt" style="color: #ff5722"></span>';
+ if ($ADAT['diakHazifeladat'][$dOra['oraId']]['hazifeladatDiakStatus'] =='kész') {
+ $hfColor = 'lightgreen';
+ } else {
+ $hfColor = '#ff5722';
+ }
+ echo '<span class="icon-home-alt" style="color: '.$hfColor.'"></span>';
} else {
echo '<span class="icon-home" style="color: #aaa"></span>';
}
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/hazifeladat.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/hazifeladat.phtml
index e2b6d3ef..c5a26c13 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/hazifeladat.phtml
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/hazifeladat.phtml
@@ -2,13 +2,13 @@
function putHazifeladat($ADAT) {
- echo '<style type="text/css">';
+/* echo '<style type="text/css">';
echo '
fieldset.adatok { margin-bottom:1em; width:80%; margin-left:auto; margin-right:auto; border-radius: 2px; border: solid 1px #ddd;}
fieldset.adatok legend { border-radius: 2px; background-color: #ff5722; color:white; padding: 2px 4px; }
';
echo '</style>';
-
+*/
echo '<fieldset class="adatok"><legend>'._ALAPADATOK.'</legend>'."\n";
echo ($ADAT['oraAdat']['dt']).' ('.$ADAT['oraAdat']['dt'].'), '.$ADAT['oraAdat']['ora'].'. '._ORA.' – <span class="tankorNev" data-tankorid="'.$ADAT['oraId']['tankorId'].'">'.$ADAT['oraAdat']['tankorNev'].'</span> – '.$ADAT['oraAdat']['kiCn'];
@@ -18,19 +18,33 @@
if (__DIAK===true) {
+ if ($ADAT['hazifeladatDiak']['hazifeladatDiakStatus']=='kész') $_class = "kesz";
+
+ if ($skin != 'ajax') formBegin(array('class'=>'hazifeladat'));
echo '<fieldset class="adatok"><legend>'.ucfirst(_TANANYAG).'</legend>'."\n";
if ($ADAT['oraAdat']['leiras']=='')
{ echo '<p style="color:#aaa;">még nincs kitöltve</p>'; }
else
{ echo '<p>'.$ADAT['oraAdat']['leiras'].'</p>'; }
echo '</fieldset>'."\n";
- echo '<fieldset class="adatok"><legend>'._HAZIFELADAT.'</legend>'."\n";
+ echo '<fieldset class="adatok '.$_class.'"><legend>'._HAZIFELADAT.'</legend>'."\n";
if ($ADAT['hazifeladatAdat']['hazifeladatLeiras']=='')
{ echo '<p style="color:#aaa;">még nincs kitöltve</p>'; }
else
{ echo ($ADAT['hazifeladatAdat']['hazifeladatLeiras']); }
echo '</fieldset>'."\n";
-
+ if ($ADAT['hazifeladatId']>0) {
+ echo '<div style="text-align:center; margin-bottom: 140px;">';
+ echo '<input type="hidden" name="action" value="hazifeladatKesz">';
+ if ($ADAT['hazifeladatDiak']['hazifeladatDiakStatus']=='kész') {
+ echo '<button type="submit" class="btnHfStatusz kesz"><span class="icon-ok-sign"></span> kész</button>';
+ } else {
+ echo '<button type="submit" class="btnHfStatusz"><span class="icon-ok-sign"></span> késznek jelölöm</button>';
+ }
+ echo '</div>';
+ }
+
+ echo formEnd();
} else {
echo '<script src="//cdn.ckeditor.com/4.14.0/standard/ckeditor.js"></script>';
if ($skin != 'ajax') formBegin(array('class'=>'hazifeladat'));
@@ -79,7 +93,35 @@
echo '<input type="submit">';
echo '</fieldset>'."\n";
if ($skin != 'ajax') formEnd();
+
+
+ if (count($ADAT['hazifeladatDiak'])>0) {
+ echo '<fieldset class="adatok">';
+ echo '<legend>Visszajelzések</legend>';
+ putHazifeladatDiak($ADAT);
+ echo '</fieldset>';
+ }
+ }
+ }
+
+ function putHazifeladatDiak($ADAT) {
+
+ if (count($ADAT['hazifeladatDiak'])==0) return false;
+
+ echo '<table class="hazifeladatDiak" cellpadding="1" cellspacing="1">';
+ echo '<thead>';
+ echo '<tr><th>diák</th><th>látta</th><th>státusz</th><th></th></tr>';
+ echo '</thead>';
+ for ($i=0; $i<count($ADAT['hazifeladatDiak']); $i++) {
+ $D = $ADAT['hazifeladatDiak'][$i];
+ echo '<tr>';
+ echo '<td class="diakNev diakAdat" data-diakid="'.$D['diakId'].'">'.$D['diakNev'].'</td>';
+ echo '<td>'.$D['diakLattamDt'].'</td>';
+ echo '<td>'.$D['hazifeladatDiakStatus'].'</td>';
+ echo '<td>'.$D['hazifeladatDiakMegjegyzes'].'</td>';
+ echo '</tr>';
}
+ echo '</table>';
}
?>
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/orarend/orarend.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/orarend/orarend.phtml
index 0aba3072..c04cd9ec 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/orarend/orarend.phtml
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/orarend/orarend.phtml
@@ -262,11 +262,12 @@
$_hianyzasClass = (is_array($_hianyzasAdat) && $_hianyzasAdat['hTipus']=='hiányzás') ? ' nemVoltBent ':'';
echo '<div class="'.$_tipusClass.$_frissClass.$_oraMostVanClass.$_utolsooraClass.$_hianyzasClass.' '.$_oraAdat.'" data-oraid="'.$_ORA['oraId'].'" title="'.$_ORA['tipus'].'" >';
if (isset($_ORA['hazifeladatId'])) {
- echo '<span class="icon-home-alt" title="h.f." style="color:#e91e63; padding-right:2px;"></span>';
+ if ($_ORA['diakHazifeladat']['hazifeladatDiakStatus'] == 'kész') $_hfcolor = 'lightgreen';
+ else $_hfcolor = '#e91e63';
+ echo '<span class="icon-home-alt" title="h.f." style="color:'.$_hfcolor.'; padding-right:2px;"></span>';
}
if (is_array($_hianyzasAdat)) {
-
echo '<span class="hianyzasTicker '.ekezettelen($_hianyzasAdat['hTipus']).' '.ekezettelen($_hianyzasAdat['statusz']).' '.ekezettelen($_hianyzasAdat['igazolas']).'">';
if ($_hianyzasAdat['hTipus']=='hiányzás')
echo '<span class="icon-hearing-impaired"></span>';
@@ -336,7 +337,6 @@ if (MAYOR_SOCIAL === true) {
if (in_array($_tankorTipus,array('délutáni','tanórán kívüli'))) {
echo ' &sup1';
}
-
echo '</div>';
if (count($T[$nap][$ora]['orak'])>$i+1)
//echo '<hr />';
diff --git a/mayor-orig/mayor-portal/log/mayor-portal.rev b/mayor-orig/mayor-portal/log/mayor-portal.rev
index cebe3996..686eea15 100644
--- a/mayor-orig/mayor-portal/log/mayor-portal.rev
+++ b/mayor-orig/mayor-portal/log/mayor-portal.rev
@@ -1 +1 @@
-4627
+4630
diff --git a/mayor-orig/mayor-wiki/log/mayor-wiki.rev b/mayor-orig/mayor-wiki/log/mayor-wiki.rev
index cebe3996..686eea15 100644
--- a/mayor-orig/mayor-wiki/log/mayor-wiki.rev
+++ b/mayor-orig/mayor-wiki/log/mayor-wiki.rev
@@ -1 +1 @@
-4627
+4630
diff --git a/mayor-orig/md5sum b/mayor-orig/md5sum
index 79c42a37..5abcd006 100644
--- a/mayor-orig/md5sum
+++ b/mayor-orig/md5sum
@@ -1,13 +1,13 @@
-Revision 4627
-9238ae5ec1a8ceaa1b9f4470a2200a65 mayor-fenntarto-rev4627.tgz
-0ec69bb6b5dea12c123db0470d0eada6 mayor-installer-sulix-rev4627.tgz
-f8f94be20577d8ad99646b9d2e54be1c mayor-wiki-rev4627.tgz
-c203cd02037be0403e001107771c3811 mayor-installer-rev4627.tgz
-75ff155715b4c3028a548f83d125744b mayor-portal-rev4627.tgz
-1dda11ba92cee4031346e61c10cad98a mayor-felveteli-rev4627.tgz
-8515bf9c07f1895a0c5fad6a456b0b0c mayor-jatek-rev4627.tgz
-a80484858d800c4245714bdc7b4763aa mayor-locales-jp_JP-rev4627.tgz
-4f2a739b44a9db7e56e4d79e6ca740f0 mayor-locales-de_DE-rev4627.tgz
-44d9657452937c8f129a18a56db1ef1f mayor-locales-en_US-rev4627.tgz
-1cce7c9ee390e62d4f4eacd276e4d866 mayor-naplo-rev4627.tgz
-7305eb9d83b3233de7c9ac255c68df17 mayor-base-rev4627.tgz
+Revision 4630
+ca14e8acf08091be07c8458889e64676 mayor-fenntarto-rev4630.tgz
+fa5f16d2c7845082dbc1f4dacd24379b mayor-installer-sulix-rev4630.tgz
+a715381fc31e27fa458de72ae5cab78d mayor-wiki-rev4630.tgz
+be0210d48558f957c6e4b42e50e08a30 mayor-installer-rev4630.tgz
+c97610239b886f8c6756a47058c09bb4 mayor-portal-rev4630.tgz
+b5dd78ccfcd93ae8edb935716dc615f6 mayor-felveteli-rev4630.tgz
+6251466609c204b02d2b72c2b9ee496f mayor-jatek-rev4630.tgz
+23d74d73ae51e0f2ca83425794c43955 mayor-locales-jp_JP-rev4630.tgz
+7987e5b502cb1629499f3ffeb1efa390 mayor-locales-de_DE-rev4630.tgz
+7e5e8800bd8bf09e631d160b73642c87 mayor-locales-en_US-rev4630.tgz
+50c3e938dcf60b49a29b46dba03db83c mayor-naplo-rev4630.tgz
+f6abbe257447f162c12af8d6f099eacc mayor-base-rev4630.tgz
diff --git a/mayor-orig/rev.txt b/mayor-orig/rev.txt
index cebe3996..686eea15 100644
--- a/mayor-orig/rev.txt
+++ b/mayor-orig/rev.txt
@@ -1 +1 @@
-4627
+4630
diff --git a/rev.txt b/rev.txt
index cebe3996..686eea15 100644
--- a/rev.txt
+++ b/rev.txt
@@ -1 +1 @@
-4627
+4630