diff --git a/admin/survey/SurveyAdmin.php b/admin/survey/SurveyAdmin.php
index 08bdd432c..c60e11197 100644
--- a/admin/survey/SurveyAdmin.php
+++ b/admin/survey/SurveyAdmin.php
@@ -5728,12 +5728,16 @@ class SurveyAdmin
/** prikaze div da so nastavitve shranjene in ga nato skrije
*
*/
- function displaySuccessSave()
- {
+ function displaySuccessSave(){
+
global $lang;
echo $lang['srv_success_save'];
}
+ function displaySuccessCopy() {
+ global $lang;
+ echo $lang['srv_diagnostika_testiranje_copied'];
+ }
/** pravilno redirekta admin url ankete
* če je anketa aktivna gre na dashboard
diff --git a/admin/survey/SurveyAdminAjax.php b/admin/survey/SurveyAdminAjax.php
index 13fbbf507..c369d21fc 100644
--- a/admin/survey/SurveyAdminAjax.php
+++ b/admin/survey/SurveyAdminAjax.php
@@ -4557,6 +4557,8 @@ class SurveyAdminAjax {
UserSetting::getInstance()->saveUserSetting();
} elseif ($_GET['a'] == 'display_success_save') {
$this->SurveyAdmin->displaySuccessSave();
+ } elseif ($_GET['a'] == 'display_success_copy') {
+ $this->SurveyAdmin->displaySuccessCopy();
} elseif ($_GET['a'] == 'vnosi_show_status_casi') {
SurveyStatusCasi :: Init($anketa);
if (isset($pid) && $pid > 0) {
diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php
index 79792948e..72a3155af 100644
--- a/admin/survey/SurveyAdminSettings.php
+++ b/admin/survey/SurveyAdminSettings.php
@@ -5868,6 +5868,11 @@ class SurveyAdminSettings {
global $lang;
echo $lang['srv_success_save'];
}
+
+ function displaySuccessCopy() {
+ global $lang;
+ echo $lang['srv_diagnostika_testiranje_copied'];
+ }
function tabTestiranje () {
global $lang;
@@ -6031,9 +6036,9 @@ class SurveyAdminSettings {
echo '
';
echo '';
- echo ' ';
+ echo ' ';
if ((($time[1]-$time[0])/$max*85) > 0)
- echo ' ';
+ echo ' ';
echo ' ';
echo ' | ';
@@ -6096,9 +6101,9 @@ class SurveyAdminSettings {
echo '';
echo '';
- echo ' ';
+ echo ' ';
if (($bruto-$neto)/$max*85 > 0)
- echo ' ';
+ echo ' ';
echo ' ';
echo ' | ';
@@ -6144,9 +6149,9 @@ class SurveyAdminSettings {
echo '';
echo '';
- echo ' ';
+ echo ' ';
if ((($time[1]-$time[0])/$maxb*85) > 0)
- echo ' ';
+ echo ' ';
echo ' ';
echo ' | ';
@@ -6213,9 +6218,9 @@ class SurveyAdminSettings {
echo '';
echo '';
- echo ' ';
+ echo ' ';
if (($bruto-$neto)/$max*85 > 0)
- echo ' ';
+ echo ' ';
echo ' ';
echo ' | ';
@@ -6721,11 +6726,28 @@ class SurveyAdminSettings {
// izpis
+ $skupni_cas = (bcdiv($total, 60, 0)>0?bcdiv($total, 60, 0).'min ':'').''.round(bcmod($total, 60), 0).'s';
+ $predviden_cas = (bcdiv($total_predvideni, 60, 0)>0?bcdiv($total_predvideni, 60, 0).'min ':'').''.round(bcmod($total_predvideni, 60), 0);
+
+ echo '';
+
echo '