aboutsummaryrefslogtreecommitdiffstats
path: root/mayor-orig
diff options
context:
space:
mode:
Diffstat (limited to 'mayor-orig')
-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.sql2
-rw-r--r--mayor-orig/mayor-naplo/log/mayor-naplo.rev2
-rw-r--r--mayor-orig/mayor-naplo/update/pre004643-1-naplo.sql27
-rw-r--r--mayor-orig/mayor-naplo/www/include/modules/naplo/share/ora.php40
-rw-r--r--mayor-orig/mayor-naplo/www/policy/private/naplo/haladasi/hazifeladat-pre.php28
-rw-r--r--mayor-orig/mayor-naplo/www/policy/private/naplo/orarend/orarend-pre.php7
-rw-r--r--mayor-orig/mayor-naplo/www/policy/private/naplo/tools/getOraAdat-pre.php3
-rw-r--r--mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/haladasi/hazifeladat.css5
-rw-r--r--mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/orarend/orarend.css14
-rw-r--r--mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/hazifeladat.phtml10
-rw-r--r--mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/orarend/orarend.phtml33
-rw-r--r--mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/uzeno/uzeno.phtml3
-rw-r--r--mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/haladasi/hazifeladat.jquery.min.js7
-rw-r--r--mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/naplo.jquery.min.js16
-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
27 files changed, 198 insertions, 49 deletions
diff --git a/mayor-orig/mayor-base/log/mayor-base.rev b/mayor-orig/mayor-base/log/mayor-base.rev
index 4fbccb1a..ff844583 100644
--- a/mayor-orig/mayor-base/log/mayor-base.rev
+++ b/mayor-orig/mayor-base/log/mayor-base.rev
@@ -1 +1 @@
-4643
+4644
diff --git a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
index 4fbccb1a..ff844583 100644
--- a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
+++ b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
@@ -1 +1 @@
-4643
+4644
diff --git a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
index 4fbccb1a..ff844583 100644
--- a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
+++ b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
@@ -1 +1 @@
-4643
+4644
diff --git a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
index 4fbccb1a..ff844583 100644
--- a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
+++ b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
@@ -1 +1 @@
-4643
+4644
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 4fbccb1a..ff844583 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 @@
-4643
+4644
diff --git a/mayor-orig/mayor-jatek/log/mayor-jatek.rev b/mayor-orig/mayor-jatek/log/mayor-jatek.rev
index 4fbccb1a..ff844583 100644
--- a/mayor-orig/mayor-jatek/log/mayor-jatek.rev
+++ b/mayor-orig/mayor-jatek/log/mayor-jatek.rev
@@ -1 +1 @@
-4643
+4644
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 4fbccb1a..ff844583 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 @@
-4643
+4644
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 4fbccb1a..ff844583 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 @@
-4643
+4644
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 4fbccb1a..ff844583 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 @@
-4643
+4644
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 efe43f5d..f8d78259 100644
--- a/mayor-orig/mayor-naplo/install/module-naplo/mysql/tanev.sql
+++ b/mayor-orig/mayor-naplo/install/module-naplo/mysql/tanev.sql
@@ -148,8 +148,10 @@ CREATE TABLE `oraHazifeladat` (
`oraId` int(10) unsigned DEFAULT NULL,
`hazifeladatLeiras` text COLLATE utf8_hungarian_ci NOT NULL,
`hazifeladatFeltoltesEngedely` tinyint(3) unsigned DEFAULT '0',
+ `hazifeladatHataridoDt` datetime DEFAULT NULL,
PRIMARY KEY (`hazifeladatId`),
UNIQUE KEY `oraId` (`oraId`),
+ KEY `hazifeladatHataridoDt` (`hazifeladatHataridoDt`),
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;
diff --git a/mayor-orig/mayor-naplo/log/mayor-naplo.rev b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
index 4fbccb1a..ff844583 100644
--- a/mayor-orig/mayor-naplo/log/mayor-naplo.rev
+++ b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
@@ -1 +1 @@
-4643
+4644
diff --git a/mayor-orig/mayor-naplo/update/pre004643-1-naplo.sql b/mayor-orig/mayor-naplo/update/pre004643-1-naplo.sql
new file mode 100644
index 00000000..4b662642
--- /dev/null
+++ b/mayor-orig/mayor-naplo/update/pre004643-1-naplo.sql
@@ -0,0 +1,27 @@
+DELIMITER $$
+DROP PROCEDURE IF EXISTS upgrade_database_4643 $$
+
+CREATE PROCEDURE upgrade_database_4643()
+BEGIN
+SET NAMES utf8 COLLATE utf8_hungarian_ci;
+
+IF NOT EXISTS (
+ SELECT * FROM information_schema.COLUMNS WHERE TABLE_SCHEMA=DATABASE() and TABLE_NAME='oraHazifeladat' and COLUMN_NAME='hazifeladatHataridoDt'
+) THEN
+
+ALTER TABLE `oraHazifeladat` ADD `hazifeladatHataridoDt` datetime DEFAULT NULL;
+
+END IF;
+
+
+IF NOT EXISTS (
+ SELECT * FROM information_schema.statistics WHERE TABLE_SCHEMA=DATABASE() and TABLE_NAME='oraHazifeladat' and INDEX_NAME = 'hazifeladatHataridoDt'
+) THEN
+
+ALTER TABLE `oraHazifeladat` ADD INDEX `hazifeladatHataridoDt` (`hazifeladatHataridoDt`);
+
+END IF;
+
+END $$
+DELIMITER ;
+CALL upgrade_database_4643();
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 60ddb4fa..1809ab50 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
@@ -26,6 +26,8 @@
munkaido,
hazifeladatId,
hazifeladatLeiras,
+ hazifeladatFeltoltesEngedely,
+ hazifeladatHataridoDt,
cimkeId, cimkeLeiras
FROM `%s`.ora
LEFT JOIN `%s`.oraHazifeladat USING (oraId)
@@ -633,6 +635,18 @@ WHERE dt>='%s' and dt<='%s' AND tankorId IN (".implode(',', array_fill(0, count(
return $R;
}
+ function getKovetkezoOraAdatByOraId($oraId) {
+ if ($oraId>0) {
+ $q = "SELECT * FROM ora WHERE oraId = %u";
+ $v = array($oraId);
+ $ORA = db_query($q,array('debug'=>false,'fv'=>'oraMostVane','modul'=>'naplo','values'=>$v,'result'=>'record'));
+ $q = "SELECT * FROM ora WHERE dt>'%s' AND tankorId=%u AND tipus NOT IN ('elmarad','elmarad_máskor') ORDER BY dt LIMIT 1";
+ $v = array($ORA['dt'],$ORA['tankorId']);
+ $R = db_query($q,array('debug'=>false,'fv'=>'oraMostVane','modul'=>'naplo','values'=>$v,'result'=>'record'));
+ }
+ return $R;
+ }
+
function getDiakOra($diakId,$dt,$ora,$olr_intezmeny = '',$olr_naplo) { // jelenlét mezőt nem vesszük figyelembe!!!
// diakId->tankor->ora
@@ -669,5 +683,31 @@ WHERE dt>='%s' and dt<='%s' AND tankorId IN (".implode(',', array_fill(0, count(
return $R;
}
+ function getDiakHazifeladatByHatarido($diakId,$ADAT,$olr='') {
+ $dt = $hazifeladatHataridoDt = readVariable($ADAT['hazifeladatHataridoDt'],'date',null);
+ $R = array();
+ if ($diakId>0 && !is_null($hazifeladatHataridoDt)) {
+ $tankorIds = getTankorByDiakId($diakId, __TANEV, $SET = array('csakId' => true, 'tolDt' => $dt, 'igDt' => $dt, 'result'=>'idonly'),$olr);
+ if (count($tankorIds)>0) {
+ $q = "SELECT *,getNev(tankorId,'tankor') AS tankorNev
+FROM oraHazifeladat
+LEFT JOIN ora USING (oraId)
+LEFT JOIN oraHazifeladatDiak ON (oraHazifeladat.hazifeladatId = oraHazifeladatDiak.hazifeladatId AND diakId=%u)
+WHERE tankorId IN (".implode(',',$tankorIds).") AND hazifeladatHataridoDt BETWEEN '%s' AND '%s 23:59:59'";
+ $v = array($diakId,$hazifeladatHataridoDt,$hazifeladatHataridoDt);
+ } else { // fallback
+ $q = "SELECT *,getNev(tankorId,'tankor') AS tankorNev FROM oraHazifeladat LEFT JOIN oraHazifeladatDiak USING (hazifeladatId) LEFT JOIN ora USING (oraId) WHERE diakId=%u AND DATE(hazifeladatHataridoDt)='%s'";
+ $v = array($diakId,$hazifeladatHataridoDt);
+ }
+ $R = db_query($q,array('debug'=>false,'fv'=>'getDiakhazifeladatByOraIds','modul'=>'naplo','values'=>$v,'result'=>'indexed'),$olr);
+ }
+ return $R;
+ }
+
+ function getOsztalyHazifeladatByHatarido($osztalyId,$ADAT,$olr='') {
+ // loop $diakId
+ $hazifeladatHataridoDt = $ADAT['hazifeladatHataridoDt'];
+
+ }
?>
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 931b7dcd..ac911f8b 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
@@ -53,21 +53,32 @@
$values = array($ADAT['oraId']);
$ADAT['hazifeladatId'] = $hazifeladatId = db_query($q, array('modul'=>'naplo','result'=>'value','values'=>$values));
$ADAT['oraAdat'] = getOraadatById($oraId);
+ $ADAT['oraAdat']['oraBeirhato'] = oraBeirhato($ADAT['oraAdat']['oraId']);
$ADAT['nevsor'] = getTankorDiakjaiByInterval($ADAT['oraAdat']['tankorId'], __TANEV, $ADAT['oraAdat']['dt'], $ADAT['oraAdat']['dt']);
-
+ $ADAT['kovetkezoOraAdat'] = getKovetkezoOraAdatByOraId($ADAT['oraAdat']['oraId']);
if (__TANAR===true && $action=='hazifeladatBeiras') {
+ $hazifeladatHataridoDt = readVariable($_POST['hazifeladatHataridoDt'],'datetime',null);
$hazifeladatFeltoltesEngedely = readVariable($_POST['hazifeladatFeltoltesEngedely'],'id',0);
if ($hazifeladatId>0) { // update
- $q = "UPDATE oraHazifeladat set hazifeladatLeiras='%s',hazifeladatFeltoltesEngedely=%u WHERE hazifeladatId=%u";
- $values = array($ADAT['hazifeladatLeiras'],$hazifeladatFeltoltesEngedely,$ADAT['hazifeladatId']);
- $r = db_query($q, array('modul'=>'naplo','result'=>'update','values'=>$values));
+ if (is_null($hazifeladatHataridoDt)) {
+ $q = "UPDATE oraHazifeladat set hazifeladatLeiras='%s',hazifeladatFeltoltesEngedely=%u WHERE hazifeladatId=%u";
+ $values = array($ADAT['hazifeladatLeiras'],$hazifeladatFeltoltesEngedely,$ADAT['hazifeladatId']);
+ } else {
+ $q = "UPDATE oraHazifeladat set hazifeladatLeiras='%s',hazifeladatFeltoltesEngedely=%u,hazifeladatHataridoDt='%s' WHERE hazifeladatId=%u";
+ $values = array($ADAT['hazifeladatLeiras'],$hazifeladatFeltoltesEngedely,$hazifeladatHataridoDt,$ADAT['hazifeladatId']);
+ }
+ $r = db_query($q, array('debug'=>false,'modul'=>'naplo','result'=>'update','values'=>$values));
} elseif ($oraId>0) { // insert
- $q = "INSERT IGNORE INTO oraHazifeladat (hazifeladatLeiras,oraId,hazifeladatFeltoltesEngedely) VALUES ('%s',%u,%u)";
- $values = array($ADAT['hazifeladatLeiras'],$ADAT['oraId'],$hazifeladatFeltoltesEngedely);
+ if (is_null($hazifeladatHataridoDt)) {
+ $q = "INSERT IGNORE INTO oraHazifeladat (hazifeladatLeiras,oraId,hazifeladatFeltoltesEngedely) VALUES ('%s',%u,%u)";
+ $values = array($ADAT['hazifeladatLeiras'],$ADAT['oraId'],$hazifeladatFeltoltesEngedely);
+ } else {
+ $q = "INSERT IGNORE INTO oraHazifeladat (hazifeladatLeiras,oraId,hazifeladatFeltoltesEngedely,hazifeladatHataridoDt) VALUES ('%s',%u,%u,'%s')";
+ $values = array($ADAT['hazifeladatLeiras'],$ADAT['oraId'],$hazifeladatFeltoltesEngedely,$hazifeladatHataridoDt);
+ }
$hazifeladatId = db_query($q, array('modul'=>'naplo','result'=>'insert','values'=>$values));
-
}
- if ($oraId>0 && strtotime(date('Y-m-d'))>=strtotime($ADAT['oraAdat']['dt'])) {
+ if ($oraId>0 && $ADAT['oraAdat']['oraBeirhato']===true ) {
$leiras = readVariable($_POST['oraLeiras'],'string');
updateHaladasiNaploOra($oraId, $leiras);
}
@@ -170,6 +181,7 @@
$ADAT['hazifeladatDiak'] = db_query($q, array('debug'=>false,'modul'=>'naplo','result'=>'indexed','values'=>$values));
}
$ADAT['oraAdat'] = getOraadatById($oraId);
+ $ADAT['oraAdat']['oraBeirhato'] = oraBeirhato($ADAT['oraAdat']['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 c56b6d87..262ff572 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
@@ -235,7 +235,14 @@
$_napok = getNapok(array('tolDt'=>$tolDt,'igDt'=>$igDt));
for ($i=0; $i<count($_napok); $i++) {
+ $_dt = $_napok[$i];
$ADAT['napok'][($i+1)] = getNapAdat($_napok[$i]);
+ if ($diakId>0) {
+ $lr = db_connect('naplo');
+ $_HF = getDiakHazifeladatByHatarido($diakId,array('hazifeladatHataridoDt'=>$_dt),$lr);
+ if (is_array($_HF) && count($_HF)>0) $ADAT['hazifeladat'][$_dt] = $_HF;
+ db_close($lr);
+ }
}
if (_POLICY!='public' && is_array($TANKOROK)) {
diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/tools/getOraAdat-pre.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/tools/getOraAdat-pre.php
index 1596e591..064bc796 100644
--- a/mayor-orig/mayor-naplo/www/policy/private/naplo/tools/getOraAdat-pre.php
+++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/tools/getOraAdat-pre.php
@@ -27,13 +27,10 @@
$leiras = readVariable($_POST['leiras'], 'string');
updateHaladasiNaploOra($oraId,$leiras);
}
-
$_JSON['oraAdat'] = $ORAADAT = getOraAdatById($oraId);
-
if ($ORAADAT['hazifeladatId']>0) {
oraHazifeladatDiakLatta($ORAADAT['hazifeladatId']); // log: diakLattamDt
}
-
if ($dolgozatBeirhato === true && $action=='dolgozatBeiras') {
$dolgozatId = ujDolgozat('',$ORAADAT['tankorId']);
dolgozatModositas($dolgozatId,'',$ORAADAT['dt']);
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
index cc5f8869..a44e9d2d 100644
--- 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
@@ -65,3 +65,8 @@
table.hazifeladatDiak tr td a:hover, fieldset.adatok a:hover { text-decoration:underline; color: cornflowerblue; }
table.hazifeladatDiak tr td.kesz { background-color: lightgreen; color:white; text-align:center }
+
+ input.modosit { background-color: #ffeb3b; }
+ span#hintDt {margin-left:5px; font-size:x-small; color:#888; cursor: copy;}
+ span#hintDt span { padding-right:2px; }
+ span#hintDt:hover { color:black; }
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/orarend/orarend.css b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/orarend/orarend.css
index 836e0ee2..9fc17d27 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/orarend/orarend.css
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/orarend/orarend.css
@@ -90,12 +90,25 @@ table.orarend tbody tr td div.jegyzet {
margin:2px;
font-size: x-small;
}
+table.orarend tbody tr td div.hazifeladat {
+ background-color: #3f51b5; color:white;
+ background-color: #e91e63;
+ border-radius:2px; padding:2px;
+ border: solid 1px white;
+ margin:2px;
+ font-size: x-small;
+}
table.orarend tbody tr td div.jegyzet.publikus0 { }
table.orarend tbody tr td div.jegyzet.publikus1 { border: dashed 1px white; }
table.orarend tbody tr td div.jegyzet.publikus2 { border: dotted 1px white; }
table.orarend tbody tr td div.jegyzet.mase.publikus1 { background-color: #4caf50;}
table.orarend tbody tr td div.jegyzet.mase.publikus2 { background-color: #4caf50;}
+
+table.orarend tbody tr td div.hazifeladat span { padding-right:2px; }
+table.orarend tbody tr td div.hazifeladat.tanarLattam { background-color: #2E7D32;}
+table.orarend tbody tr td div.hazifeladat.diakKesz { background-color: #4CAF50;}
+
table.orarend tbody tr.orarendJegyzetSor th { background-color: orange; border-color: orange; font-weight:normal; font-size: x-small; cursor: pointer}
table.orarend tbody tr.orarendJegyzetSor td.jegyzetContainer { background-color: cornflowerblue; }
table.orarend tbody tr.orarendJegyzetSor td.jegyzetContainer div:hover { border-color: #bbb; transition : border 50ms ease-out;}
@@ -215,7 +228,6 @@ div.unfinished {
table.orarend span.cimke_4 { background-color: #673ab7; }
-
h2.mayorSocialEdition {
text-align: center;
background-color: #f06;
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 e03ac99a..83d5d6f1 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
@@ -107,7 +107,7 @@
echo '<input type="hidden" name="hazifeladatId" value="'.$ADAT['hazifeladatId'].'"/>';
echo '<fieldset class="adatok"><legend>'.ucfirst(_TANANYAG).'</legend>'."\n";
- if ($ADAT['oraAdat']['oraId']>0 && strtotime(date('Y-m-d'))>=strtotime($ADAT['oraAdat']['dt'])) {
+ if ($ADAT['oraAdat']['oraId']>0 && strtotime(date('Y-m-d'))>=strtotime($ADAT['oraAdat']['dt']) && $ADAT['oraAdat']['oraBeirhato']===true) {
echo '<input type="text" name="oraLeiras" value="'.$ADAT['oraAdat']['leiras'].'" style="width:70%">';
echo '<input type="submit">';
} else {
@@ -116,6 +116,7 @@
echo '</fieldset>'."\n";
echo '<fieldset class="adatok"><legend>'._HAZIFELADAT.'</legend>'."\n";
+
echo '<textarea name="hazifeladatLeiras" class="wysiwyg" rows="10" cols="80" style="width:100%">';
echo htmlspecialchars($ADAT['hazifeladatAdat']['hazifeladatLeiras']);
echo '</textarea>';
@@ -151,6 +152,13 @@
echo '<input type="checkbox" name="hazifeladatFeltoltesEngedely" id="hazifeladatFeltoltesEngedelyChk" value="1" '.$_CHK.'/>';
echo '<label for="hazifeladatFeltoltesEngedelyChk">Diák/Szülő házi feladat csatolás engedélyezve</label>';
echo '</div>';
+ echo 'Leadási határidő: <input type="text" class="datetime" name="hazifeladatHataridoDt" id="hazifeladatHataridoDt" value="'.$ADAT['hazifeladatAdat']['hazifeladatHataridoDt'].'" placeholder="nem kötelező">';
+ if ($ADAT['kovetkezoOraAdat']['oraId']>0) {
+ echo '<span id="hintDt" data-hintdt="'.$ADAT['kovetkezoOraAdat']['dt'].' 08:00:00">';
+ echo '<span class="icon-circle-arrow-left"></span>';
+ echo 'következő tervezett óra: '.$ADAT['kovetkezoOraAdat']['dt'];
+ echo '</span>';
+ }
echo '<div style="width:100%; margin:auto; text-align:center;">';
echo '<input type="submit" class="btnSubmit">';
echo '</div>';
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 77ad0bce..f36850bc 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
@@ -24,11 +24,7 @@
function putOrarend($ADAT) {
global $aHetNapjai,$skin;
- // $ADAT['utolsoorak'][$teremId]['oraId']
-
-
/* Képzés-Mátrix */
- //dump($ADAT['kepzesOraterv']);
if (is_array($ADAT['kepzesOraterv']) && count($ADAT['kepzesOraterv'])>0) {
$kepzes_figyel = true;
$KEPZES_MATRIX[2]=$ADAT['kepzesOraterv']['első nyelv']['sum'];
@@ -37,7 +33,6 @@
+$ADAT['kepzesOraterv']['kötelezően választható']['sum']
+$ADAT['kepzesOraterv']['szabadon választható']['sum']
;
- //dump($KEPZES_MATRIX);
} else $kepzes_figyel = false;
// ----------------
$multiTelephely = (count($ADAT['orarend']['telephelyIdk'])>1);
@@ -152,10 +147,10 @@
}
echo '<tbody>'."\n";
// echo '<caption>'.$het.'. heti órarend</caption>';
- if (count($ADAT['dolgozat']['tervezett'])>0 || count($ADAT['jegyzet'])>0) { $_jegyzetSorCss = ''; } else { $_jegyzetSorStyle = 'display:none;'; }
+ if (count($ADAT['dolgozat']['tervezett'])>0 || count($ADAT['jegyzet'])>0 || (is_array($ADAT['hazifeladat']) && count($ADAT['hazifeladat'])>0)) { $_jegyzetSorCss = ''; } else { $_jegyzetSorStyle = 'display:none;'; }
echo '<tr id="orarendJegyzetSor" class="orarendJegyzetSor" style="'.$_jegyzetSorStyle.'">';
echo '<th>';
- echo 'dolgozatok, jegyzetek';
+ echo 'dolgozatok, jegyzetek, határidők';
// echo '<span class="icon-info-sign"></span>';
echo '</th>';
for ($nap=1;$nap<=$ADAT['hetiMaxNap'];$nap++) {
@@ -192,6 +187,30 @@
echo '</div>';
}
}
+
+ //for ($d=0; $d<count($ADAT['hazifeladat'][$dt]); $d++) {
+ if (is_array($ADAT['hazifeladat'][$dt]) && count($ADAT['hazifeladat'][$dt])>0) {
+ for ($_h=0; $_h<count($ADAT['hazifeladat'][$dt]); $_h++) {
+ $_HF = $ADAT['hazifeladat'][$dt][$_h];
+ $_oraId = $_HF['oraId'];
+ $_str = '';
+ // hazifeladatDiakStatus, diakLattamDt, tanarLattamDt, hazifeladatFeltoltesiEngedely
+ if ($_HF['hazifeladatFeltoltesEngedely']) {
+ if ($_HF['tanarLattamDt']!='') { $_hfIcon = 'icon-ok-sign'; $_str = 'elfogadva'; }
+ elseif ($_HF['hazifeladatDiakStatus']!='') { $_hfIcon = 'icon-ok-circle'; $_str = 'feltöltve';}
+ else {$_hfIcon = 'icon-paper-clip-alt'; $_str = 'leadási határidő';}
+ } else {
+ if ($_HF['tanarLattamDt']!='') { $_hfIcon = 'icon-ok'; $_str = 'elfogadva';}
+ elseif ($_HF['hazifeladatDiakStatus']!='') { $_hfIcon = 'icon-ok-circle'; $_str = 'kész';}
+ else {$_hfIcon = 'icon-home-alt'; $_str='határidő';}
+ }
+ if ($_HF['tanarLattamDt']!='') $_hfClass = 'tanarLattam';
+ elseif ($_HF['hazifeladatDiakStatus']!='') $_hfClass = 'diakKesz';
+ else $_hfClass = '';
+ echo '<div class="hazifeladat oraAdat '.$_hfClass.'" data-oraid="'.$_oraId.'" data-hazifeladatid="'.$x.'"><span class="'.$_hfIcon.'"></span>házifeladat '.$_str.'<br/>'.$_HF['tankorNev'].'</div>';
+ }
+ }
+ //}
echo '</td>';
}
echo '</tr>';
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/uzeno/uzeno.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/uzeno/uzeno.phtml
index 24304570..a7302388 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/uzeno/uzeno.phtml
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/uzeno/uzeno.phtml
@@ -124,7 +124,8 @@
$href_szal = href('index.php?page=naplo&sub=uzeno&f=uzeno&szalId='.$D['feladoId'].'_'.$D['feladoTipus'].'_'.$D['cimzettId'].'_'.$D['cimzettTipus'].'&mId='.$D['mId'],array('sessionID','lang','policy'));
// $D['txt'] = '<a href="'.$href_szal.'">'.nl2br(htmlspecialchars($D['txt'])).'</a>';
- $D['txt'] = makelinksclickable(nl2br(supertext($D['txt'])));
+ // $D['txt'] = makelinksclickable(nl2br(supertext($D['txt'])));
+ $D['txt'] = (nl2br(supertext($D['txt'])));
echo (mb_substr($D['txt'],0,2000,'UTF-8'));
if (mb_strlen($D['txt'],'UTF-8')>2000) {
echo ' <a class="more" href="'.$href.'">...</a>';
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/haladasi/hazifeladat.jquery.min.js b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/haladasi/hazifeladat.jquery.min.js
index 4d225a86..a8e1d250 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/haladasi/hazifeladat.jquery.min.js
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/haladasi/hazifeladat.jquery.min.js
@@ -9,4 +9,11 @@ $(function() {
}
});
+ $('#hintDt').click(function(){
+ // console.log($('#hazifeladatHataridoDt').val());
+ $('#hazifeladatHataridoDt').addClass('modosit');
+ $('#hazifeladatHataridoDt').val($('#hintDt').data('hintdt'));
+ });
+
+
}); \ No newline at end of file
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/naplo.jquery.min.js b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/naplo.jquery.min.js
index df72b0cb..b5d19f89 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/naplo.jquery.min.js
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/naplo.jquery.min.js
@@ -727,18 +727,30 @@ processJSONOraAdat = function(adat) {
}
}
+
// content += '<h3>Óra kapcsolatai</h3>';
// content += '<ul><li>Beírt mulasztások száma: '+'n/a'+'</li>';
// content += '<li>Beírt jegyek száma: '+'n/a'+'</li>';
// content += '</ul>';
content += '<h3>Házi feladat ';
- content += '<a href="'+href({'page':'naplo','sub':'haladasi','f':'hazifeladat','oraId':adat['oraAdat']['oraId']})+'"><span class="icon-resize-full"></span></a>';
+ content += '<a href="'+href({'page':'naplo','sub':'haladasi','f':'hazifeladat','oraId':adat['oraAdat']['oraId']})+'">';
+ if (adat['oraAdat']['hazifeladatFeltoltesEngedely']==1) {
+ content += '<span class="icon-paper-clip"></span>';
+ } else {
+ content += '<span class="icon-resize-full"></span>';
+ }
+ content += '</a>';
content += '</h3>';
if (adat['oraAdat']['hazifeladatId']>0) {
- content += '<div style="border-left: solid 0px #888; padding: 4px; background-color:#444;">';
+ if (adat['oraAdat']['hazifeladatHataridoDt']!=null) {
+ content += '<ul><li style="font-style:x-small;">Határidő: '+adat['oraAdat']['hazifeladatHataridoDt']+' <span class="icon-time"></span></li></ul>';
+ }
+ if (adat['oraAdat']['hazifeladatLeiras']!='') {
+ content += '<div style="border-left: solid 0px #888; padding: 4px; background-color: #e91e63; font-size: x-small;">';
content += adat['oraAdat']['hazifeladatLeiras'];
content += '</div>';
+ }
}
content += '<h3>Dolgozatok</h3>';
diff --git a/mayor-orig/mayor-portal/log/mayor-portal.rev b/mayor-orig/mayor-portal/log/mayor-portal.rev
index 4fbccb1a..ff844583 100644
--- a/mayor-orig/mayor-portal/log/mayor-portal.rev
+++ b/mayor-orig/mayor-portal/log/mayor-portal.rev
@@ -1 +1 @@
-4643
+4644
diff --git a/mayor-orig/mayor-wiki/log/mayor-wiki.rev b/mayor-orig/mayor-wiki/log/mayor-wiki.rev
index 4fbccb1a..ff844583 100644
--- a/mayor-orig/mayor-wiki/log/mayor-wiki.rev
+++ b/mayor-orig/mayor-wiki/log/mayor-wiki.rev
@@ -1 +1 @@
-4643
+4644
diff --git a/mayor-orig/md5sum b/mayor-orig/md5sum
index 19543162..b3aec885 100644
--- a/mayor-orig/md5sum
+++ b/mayor-orig/md5sum
@@ -1,13 +1,13 @@
-Revision 4643
-bc36d1c5e47744e544439c0030a091be mayor-fenntarto-rev4643.tgz
-1d4e1f10ce7975b5239891389a099655 mayor-installer-sulix-rev4643.tgz
-4ba1eea4e3571eac402b74229621f47d mayor-wiki-rev4643.tgz
-8f0c90bb4b8f32c8155fbdc0930089fb mayor-installer-rev4643.tgz
-b86eed6f38dfe5c5a6c43ecb41d6fade mayor-portal-rev4643.tgz
-edf95931bebc03d1021c5d9af179bef3 mayor-felveteli-rev4643.tgz
-c96ddf6ac402201374ca7ffb3a1b5b67 mayor-jatek-rev4643.tgz
-23e9bdccc90a05baf51794a5dfd73fa5 mayor-locales-jp_JP-rev4643.tgz
-0aee8ce539a4a01f6933c4826743be65 mayor-locales-de_DE-rev4643.tgz
-658c650356020fb3e1947d18db0836bb mayor-locales-en_US-rev4643.tgz
-659e20ffd263aa865b2b202967c7aa70 mayor-naplo-rev4643.tgz
-9916a08bb6a312dec821621f9e9d104f mayor-base-rev4643.tgz
+Revision 4644
+ab263d8b93d75df53b598ccc24c4d975 mayor-fenntarto-rev4644.tgz
+49cb8a50daad5818311541b7852dcc0c mayor-installer-sulix-rev4644.tgz
+ed32d2aa7c4c13278df05fd1beda9985 mayor-wiki-rev4644.tgz
+88660591b1c72b90f0e0ebd851f7a61e mayor-installer-rev4644.tgz
+a717d073783b600af8a02033450a2cf9 mayor-portal-rev4644.tgz
+9e2ca0586190b28f4291b932a0904917 mayor-felveteli-rev4644.tgz
+5bdd1fb3f12661bff6a4c545ad32dabc mayor-jatek-rev4644.tgz
+602762e9f6894a1520eaccadbffc2dca mayor-locales-jp_JP-rev4644.tgz
+95f02e80fa79baf96d25c282b8e060ad mayor-locales-de_DE-rev4644.tgz
+d7fd6f4d8e0b3ce2500d2bc5b1d7cfc8 mayor-locales-en_US-rev4644.tgz
+10d420ecd874566129caca3420b486b1 mayor-naplo-rev4644.tgz
+3b029f0dd842be81764f6273b8ec3957 mayor-base-rev4644.tgz
diff --git a/mayor-orig/rev.txt b/mayor-orig/rev.txt
index 4fbccb1a..ff844583 100644
--- a/mayor-orig/rev.txt
+++ b/mayor-orig/rev.txt
@@ -1 +1 @@
-4643
+4644
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-24 08:12:43 +0000