|
|
@@ -592,7 +592,7 @@ function task_CRM_TEST() {
|
|
|
if ($lastTestDate == '0000-00-00 00:00:00') $lastTestDate = null;
|
|
|
}
|
|
|
|
|
|
-/*
|
|
|
+/*
|
|
|
* WAITING - nowy test - oczekiwanie na rozpoczecie testu
|
|
|
* MONITOR - test rozpoczety z data TEST_INIT
|
|
|
* NORMAL - test zakonczony - do ocenienia TEST_END
|
|
|
@@ -772,7 +772,7 @@ function task_CRM_TEST() {
|
|
|
<?php echo App::link("Przeczytalem - rozpocznij test", array('task'=>App::get_task(), 'function_init'=>'fun_CRM_TEST_EDIT', 'subtask'=>'START', 'test_id'=>$test_obj->ID), array('class'=>'btn btn-primary')); ?>
|
|
|
</p>
|
|
|
<p>Po rozpoczęciu testu nie ma możliwości powrotu do procesu.
|
|
|
- <br>Test wielokrotnego wyboru,
|
|
|
+ <br>Test wielokrotnego wyboru,
|
|
|
należy odpowiedzieć na <b>wszystkie pytania</b> zaznaczając TAK lub NIE</p>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -1046,15 +1046,23 @@ function task_CRM_TESTY__ADD_TEST() {
|
|
|
$idProces = V::get('proces_id', 0, $_GET, 'int');
|
|
|
$testType = V::get('test_type', '', $_GET);
|
|
|
|
|
|
- ?>
|
|
|
+ $linkPrint = 'procesy5.php?task=CRM_TESTY__ADD_TEST&_print=1&HIDE_PANEL=1';
|
|
|
+ if ($idStanowiska) $linkPrint .= "&stanowisko_id={$idStanowiska}";
|
|
|
+ // if ($idProces) $linkPrint .= "&proces_id={$idProces}";
|
|
|
+ if ('1' != V::get('_print', '', $_GET)) {
|
|
|
+?>
|
|
|
<ol class="breadcrumb">
|
|
|
<li><?php echo App::link("Testy", array('task'=>'CRM_TESTY')); ?></li>
|
|
|
<li><?php echo App::link("Uruchom nowy test", array('task'=>'CRM_TESTY__ADD_TEST')); ?></li>
|
|
|
<?php if ($idStanowiska > 0) : ?>
|
|
|
<li class="active">Testy dla stanowiska [<?php echo $idStanowiska; ?>]</li>
|
|
|
<?php endif; ?>
|
|
|
+ <a style="float:right; font-size:12px; line-height:1.5"
|
|
|
+ target="_blank"
|
|
|
+ href="<?= $linkPrint; ?>"><i class="glyphicon glyphicon-print"></i> drukuj</a>
|
|
|
</ol>
|
|
|
<?php
|
|
|
+ }
|
|
|
|
|
|
function this_CRM_TESTY_view_selected_args($stanowisko = null, $proces = null) {
|
|
|
// procesy5.php?task=CRM_TESTY__ADD_TEST&proces_id=5039&test_type=TEORETYCZNY&stanowisko_id=21168
|
|
|
@@ -1256,7 +1264,7 @@ function task_CRM_TESTY__ADD_TEST() {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
// choose STANOWISKO
|
|
|
$stanowiska = array();
|
|
|
|
|
|
@@ -1371,7 +1379,7 @@ function task_CRM_TESTY__ADD_TEST() {
|
|
|
foreach ($stanowiska as $k_id => $r) {
|
|
|
$tree_flat[$r->ID] = null;
|
|
|
$tree_flat[$r->PARENT_ID] = null;
|
|
|
- }
|
|
|
+ }
|
|
|
|
|
|
$tree_created = TreeHelper::build_tree_flat('CRM_LISTA_ZASOBOW', $tree_flat);
|
|
|
//echo'<pre style="max-height:200px;overflow:auto;border:1px solid red;">{'.$tree_created.'} Tree flat: ';print_r($tree_flat);echo'</pre>';
|
|
|
@@ -1887,9 +1895,9 @@ function task_CRM_TESTY_ADD_PYTANIA() {
|
|
|
echo ' <p>'.$w->DESC.'</p> ';
|
|
|
}
|
|
|
|
|
|
- //if ($tree->get_param('rozwin_opis'))
|
|
|
+ //if ($tree->get_param('rozwin_opis'))
|
|
|
echo ' <span class="green">'.$w->OPIS.'</span>';// opis zasobu
|
|
|
- //if ($tree->get_param('rozwin_opis'))
|
|
|
+ //if ($tree->get_param('rozwin_opis'))
|
|
|
echo ' <span style="color:#000;">'.$w->OPIS_ZASOB.'</span>';// komentarz wskaznika
|
|
|
|
|
|
echo'</p>';
|
|
|
@@ -1966,7 +1974,7 @@ a.btn-test-praktyczny {background-color:#B3EBFB;}
|
|
|
$field = "ODP_".$i."_ODP";
|
|
|
$r->$field = V::get( $prefix.$field, '', $_POST);
|
|
|
}//end for
|
|
|
-
|
|
|
+
|
|
|
// TODO: validate
|
|
|
$errors = array();
|
|
|
|
|
|
@@ -2407,7 +2415,7 @@ function task_CRM_TESTY_WYNIKI_CERTYFIKAT() {
|
|
|
echo '<td rowspan="2">' . "Data szkolenia" . '</td>';
|
|
|
echo '<td rowspan="2">' . "Organizator Szkolenia" . '</td>';
|
|
|
echo '<td rowspan="2">' . "Miejsce szkolenia" . '</td>';
|
|
|
- echo '<td rowspan="2">' . "Data testu" . '</td>';// "Data szkolenia" - drugi raz?
|
|
|
+ echo '<td rowspan="2">' . "Data testu" . '</td>';// "Data szkolenia" - drugi raz?
|
|
|
echo '<td rowspan="2">' . "Czas szkolenia" . '</td>';
|
|
|
echo '<td rowspan="2">' . "Ocena" . '</td>';
|
|
|
echo '<td rowspan="2">' . "Całkowity koszt udziału jednego uczestnika w szkoleniu" . '</td>';
|
|
|
@@ -2432,7 +2440,7 @@ function task_CRM_TESTY_WYNIKI_CERTYFIKAT() {
|
|
|
echo'<td>' . '<nobr>' . substr($test->TEST_END, 0, 10) . '</nobr>' . '</td>';
|
|
|
echo'<td>' . '...' . '</td>';// TEST_TIME "Czas szkolenia" - (uzupe??nia?? przy przy ocenianiu )
|
|
|
echo'<td>' . $test->OCENA . '</td>';
|
|
|
- echo'<td>' . number_format($test->COST, 2, ',', ' ') . " zł" . '</td>';// COST "Ca??kowity koszt udzia??u jednego uczestnika w szkoleniu" - (uzupe??niane przy ocenianiu)
|
|
|
+ echo'<td>' . number_format($test->COST, 2, ',', ' ') . " zł" . '</td>';// COST "Ca??kowity koszt udzia??u jednego uczestnika w szkoleniu" - (uzupe??niane przy ocenianiu)
|
|
|
echo'<td>' . number_format($test->DISCOUNT, 2, ',', ' ') . " zł" . '</td>';
|
|
|
echo'<td>' . $test->UWAGI . '</td>';
|
|
|
echo'</tr>';
|
|
|
@@ -2606,7 +2614,7 @@ function task_CRM_TESTY_WYNIKI_HIST() {
|
|
|
}
|
|
|
echo '</tbody>';
|
|
|
echo '</table>';
|
|
|
-
|
|
|
+
|
|
|
}
|
|
|
|
|
|
|
|
|
@@ -2768,19 +2776,19 @@ function fun_TEST_SORT_SAVE() {
|
|
|
$path_arr=explode('/', $v_proces->path);
|
|
|
foreach($path_arr as $path) {
|
|
|
$col_temp_r=dechex(rand(0,25)*10);
|
|
|
- $col_temp_g=dechex(rand(0,25)*10);
|
|
|
- $col_temp_b=dechex(rand(0,25)*10);
|
|
|
+ $col_temp_g=dechex(rand(0,25)*10);
|
|
|
+ $col_temp_b=dechex(rand(0,25)*10);
|
|
|
if(empty($color[$path])) $color[$path]="color='#".(strlen($col_temp_r)==1 ? "0".$col_temp_r : $col_temp_r ).(strlen($col_temp_g)==1 ? "0".$col_temp_g : $col_temp_g ).(strlen($col_temp_b)==1 ? "0".$col_temp_b : $col_temp_b );
|
|
|
echo " <font color=".$color[$path].">".$path."</font>(".$v_proces->SORT_PRIO.")";
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
if($path_arr[count($path_arr)-2]==$path_last['ID']) { //ostatni parent jest taki sam, wiec sa w jednym miejscu
|
|
|
// if($v_proces->TEST_SORT_PRIO>$path_last['TEST_SORT_PRIO']) echo "wieksz. TSP niz ostatni";
|
|
|
// if($v_proces->TEST_SORT_PRIO<=$path_last['TEST_SORT_PRIO']) echo "mniejsz. TSP niz ostatni";
|
|
|
-// if($v_proces->SORT_PRIO>$path_last['SORT_PRIO']) echo "OK ? wieksz. sort niz ostatni";
|
|
|
- if($v_proces->SORT_PRIO<$path_last['SORT_PRIO']) echo " Błąd kolejności pod kątem ustalenia w drzewie procesów";
|
|
|
+// if($v_proces->SORT_PRIO>$path_last['SORT_PRIO']) echo "OK ? wieksz. sort niz ostatni";
|
|
|
+ if($v_proces->SORT_PRIO<$path_last['SORT_PRIO']) echo " Błąd kolejności pod kątem ustalenia w drzewie procesów";
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
$path_last['ID']=$path_arr[count($path_arr)-2];
|
|
|
$path_last['TEST_SORT_PRIO']=$v_proces->TEST_SORT_PRIO;
|
|
|
$path_last['SORT_PRIO']=$v_proces->SORT_PRIO;
|