diff options
| author | M.Gergo | 2020-08-24 13:05:03 +0200 |
|---|---|---|
| committer | M.Gergo | 2020-08-24 13:05:03 +0200 |
| commit | e22bbedcf69ea347a103d04d194136b8f3a761c8 (patch) | |
| tree | 5d5653a23f1070af88f2fac633a75836e1e4bfb4 /mayor-orig/mayor-naplo/www/skin | |
| parent | 37d424aa0d36fdb47e931340f7920a92870e3c34 (diff) | |
| download | mayor-rev4670.tar.gz mayor-rev4670.zip | |
Rev: 4670rev4670
Diffstat (limited to 'mayor-orig/mayor-naplo/www/skin')
| -rw-r--r-- | mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/import/tantargyFelosztas.phtml | 16 | ||||
| -rw-r--r-- | mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/share/file.phtml | 8 |
2 files changed, 18 insertions, 6 deletions
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/import/tantargyFelosztas.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/import/tantargyFelosztas.phtml index 5fe6435a..2980672b 100644 --- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/import/tantargyFelosztas.phtml +++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/import/tantargyFelosztas.phtml @@ -29,7 +29,8 @@ table.ttf tr.createTankor td { background-color: magenta;} table.ttf tr.done td { background-color: lightgreen;} - table.ttf tr td {padding:4px;} + table.ttf tr td {padding:4px; border-bottom: solid 1px #ccc;} + table.ttf tr td:hover {outline: solid 2px cornflowerblue;} table.ttf tr td div.tankorLista span:hover { color: white; } </style>'; @@ -104,7 +105,7 @@ echo '<option>--'.$D['action'].'--</option>'; for ($j=0; $j<count($D['displayTankor']); $j++) { $_SEL = (count($D['displayTankor'])==1 && $D['action']=='tankorHozzarendel') ? ' selected="selected" ': ''; - echo '<option value="'.$D['csoportId'].':####:'.$D['tanarId'].':####:'.$D['displayTankor'][$j]['tankorId'].':####:'.$D['oraszam'].'" '.$_SEL.'>'.$D['displayTankor'][$j]['tankorNev'].'</option>'; + echo '<option value="'.$D['csoportId'].':####:'.$D['tanarId'].':####:'.$D['displayTankor'][$j]['tankorId'].':####:'.$D['oraszam'].'" '.$_SEL.'>'.$D['displayTankor'][$j]['tankorNev'].' ('.$D['displayTankor'][$j]['tankorId'].')</option>'; } echo '</select>'; echo '<div class="tankorLista">'; @@ -124,7 +125,16 @@ echo '</div>'; // ha ezt összehasonlítom a mayorban rögzített névsorral, akkor eldönhető lehet, hogy melyik a jó választás! echo ' Új tankör:'; - echo '<input type="checkbox" name="ujTankor[]" value="'.$D['csoportId'].':####:'.$D['tanarId'].':####:'.$_osztalyok.':####:'.$D['targyId'].'.'.':####:'.$_O.':####:'.$D[1].'" />'; + if (count($_osztalyok)>0) { + echo '<input type="checkbox" name="ujTankor[]" value="'.$D['csoportId'].':####:'.$D['tanarId'].':####:'.$_osztalyok.':####:'.$D['targyId'].'.'.':####:'.$_O.':####:'.$D[1].'" />'; + } else { + echo '<select name="ujTankor[]">'; + echo '<option value=""></option>'; + foreach ($ADAT['kulcsertektar']['osztalyjel2id'] as $__osztalyJel => $__osztalyId) { // TODO osztalyJel mayorbol inkabb + echo '<option value="'.$D['csoportId'].':####:'.$D['tanarId'].':####:'.$__osztalyId.':####:'.$D['targyId'].'.'.':####:'.$_O.':####:'.$D[1].'">'.$__osztalyJel.'</option>'; + } + echo '</select>'; + } } elseif ($D['action'] == 'createTankor') { echo 'Új tankör létrehozása: <input type="text" name="ujTankor[]" value="'.$D['csoportId'].':####:'.$D['tanarId'].':####:'.$_osztalyok.':####:'.$D['targyId'].'.'.':####:'.$_O.':####:'.$D[1].'" />'; } else { diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/share/file.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/share/file.phtml index 7720f2ba..a1ac34d4 100644 --- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/share/file.phtml +++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/share/file.phtml @@ -2,7 +2,7 @@ function putFileSelectForm($dbtable, $post = array()) { - formBegin(array('class'=>'updateTable')); + formBegin(array('class'=>'updateTable', 'enctype'=>'multipart/form-data')); // A form címe if (defined('_FILESELECTTITLE')) echo '<h1>'._FILESELECTTITLE.'</h1>'; // A továbbadandó POST adatok @@ -12,8 +12,10 @@ } echo '<input type="hidden" name="dbtable" value="'.$dbtable.'">'."\n"; echo '<input type="checkbox" name="skipOnDup" value="true" /> Meglevő rekord találatkor kihagyjuk a rekord frissítést'; - echo '<label for="file">'._FILENEV.':</label>'."\n"; - echo '<input type="text" id="file" name="fileName" />'."\n"; + echo '<p><label for="file">'._FILENEV.':</label>'."\n"; + echo '<input type="text" id="file" name="fileName" /></p>'."\n"; + echo '<p>Vagy feltöltés:'; + echo '<input type="file" name="upfile" /></p>'; echo '<input type="submit" value="'._OK.'" />'."\n"; formEnd(); |