';
+ echo '
';
#izbriši
echo ' ';
#uredi
@@ -1715,11 +1726,11 @@ class SurveyTelephone {
echo '
';
echo '';
echo '';
echo '';
@@ -3099,7 +3110,17 @@ class SurveyTelephone {
$sql2 = sisplet_query("SELECT DATE_FORMAT(insert_time, '%d.%m.%Y %H:%i:%s'), status FROM srv_telephone_history WHERE rec_id='$usr_id' ORDER BY insert_time ASC");
if (mysqli_num_rows($sql2) > 0 ) {
while (list($insert_time, $status) = mysqli_fetch_array($sql2)) {
- echo ''.$insert_time.' - '.$lang['srv_telephone_status_'.$status].'
';
+ echo '';
+ echo '
';
+ echo '
';
+ echo $insert_time;
+ echo '
';
+ echo '
';
+ echo $lang['srv_telephone_status_'.$status.'2'];
+ echo '
';
+ echo '
';
+ echo '';
if ($status == 'U' || $status == 'R') {
# preverimo ali lahko uporabnika še kontaktiramo
$canCall = false;
@@ -3110,6 +3131,7 @@ class SurveyTelephone {
} else {
echo $lang['srv_telephone_status_'];
}
+
echo '
';
echo '
';
diff --git a/lang/1.php b/lang/1.php
index 16852d086..0b3b0ac57 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -6383,7 +6383,7 @@ $lang = array (
'srv_telephone_respondents_unsubscribed' => 'Odjavljeno',
'srv_telephone_respondents_pass' => 'Geslo',
'srv_telephone_respondents_password' => 'PASSWORD',
- 'srv_telephone_respondents_status' => 'Status',
+ 'srv_telephone_respondents_status' => 'Status klica',
'srv_telephone_respondents_ime' => 'Ime',
'srv_telephone_respondents_firstname' => 'FIRSTNAME',
'srv_telephone_respondents_lastname' => 'LASTNAME',
@@ -6395,7 +6395,7 @@ $lang = array (
'srv_telephone_respondents_email' => 'EMAIL',
'srv_telephone_respondents_schedule_call_time' => 'Naslednji klic',
'srv_telephone_respondents_comment' => 'Komentar',
- 'srv_telephone_respondents_schstatus' => 'Status',
+ 'srv_telephone_respondents_schstatus' => 'Status klica',
'srv_telephone_respondents_date_inserted' => 'Dodan dne',
'srv_telephone_respondents_list_id' => 'Seznam',
'srv_telephone_respondents_usr_email' => 'Dodal',
@@ -6406,13 +6406,21 @@ $lang = array (
'srv_telephone_table_call_status' => 'Status klica',
'srv_telephone_status_' => 'Uporabnik še ni bil kontaktiran',
'srv_telephone_status_A' => '»A« - Respondent je začel z anketiranjem',
+ 'srv_telephone_status_A2' => 'Začel',
'srv_telephone_status_U' => '»U« - Uspešno zaključena anketa',
+ 'srv_telephone_status_U2' => 'Zaključen',
'srv_telephone_status_T' => '»T« - Dogovorjen za drug termin',
+ 'srv_telephone_status_T2' => 'Prestavljen',
'srv_telephone_status_P' => '»P« - Anketa je bila prekinjena',
+ 'srv_telephone_status_P2' => 'Prekinjen',
'srv_telephone_status_R' => '»R« - Zavrnil',
+ 'srv_telephone_status_R2' => 'Zavrnil',
'srv_telephone_status_Z' => '»Z« - Zaseden',
+ 'srv_telephone_status_Z2' => 'Zaseden',
'srv_telephone_status_N' => '»N« - Nedosegljiv',
+ 'srv_telephone_status_N2' => 'Nedosegljiv',
'srv_telephone_status_D' => '»D« - Preložen',
+ 'srv_telephone_status_D2' => 'Preložen',
'srv_telephone_add_sample' => "000 111 222,Janez,Novak, 000 333 444,,Novak",
'srv_telephone_call_start' => 'Začni s klicanjem',
'srv_telephone_call_available' => 'Prostih telefonskih številk na voljo:',
diff --git a/lang/2.php b/lang/2.php
index 633c82e99..8fb59bb7d 100644
--- a/lang/2.php
+++ b/lang/2.php
@@ -6282,14 +6282,14 @@ $lang = array (
'srv_telephone_respondents_custom' => 'CUSTOM',
'srv_telephone_respondents_phone' => 'PHONE',
'srv_telephone_respondents_email' => 'EMAIL',
- 'srv_telephone_respondents_status' => 'Status',
+ 'srv_telephone_respondents_status' => 'Call status',
'srv_telephone_respondents_ime' => 'First name',
'srv_telephone_respondents_priimek' => 'Last name',
'srv_telephone_respondents_telefon' => 'Telephone number',
'srv_telephone_respondents_email' => 'Email',
'srv_telephone_respondents_schedule_call_time' => 'Next call',
'srv_telephone_respondents_comment' => 'Comment',
- 'srv_telephone_respondents_schstatus' => 'Status',
+ 'srv_telephone_respondents_schstatus' => 'Call status',
'srv_telephone_respondents_date_inserted' => 'Added on',
'srv_telephone_respondents_list_id' => 'List',
'srv_telephone_respondents_usr_email' => 'Added by',
@@ -6300,13 +6300,21 @@ $lang = array (
'srv_telephone_table_call_status' => 'Call status',
'srv_telephone_status_' => 'This user has not been contacted.',
'srv_telephone_status_A' => '»A« - Respondent began survey',
+ 'srv_telephone_status_A2' => 'Started',
'srv_telephone_status_U' => '»U« - Successfully finished survey',
+ 'srv_telephone_status_U2' => 'Finished',
'srv_telephone_status_T' => '»T« - Another appointment',
+ 'srv_telephone_status_T2' => 'Rescheduled',
'srv_telephone_status_P' => '»P« - The survey was interrupted',
- 'srv_telephone_status_R' => '»R« - Reject',
+ 'srv_telephone_status_P2' => 'Interrupted',
+ 'srv_telephone_status_R' => '»R« - Rejected',
+ 'srv_telephone_status_R2' => 'Rejected',
'srv_telephone_status_Z' => '»Z« - Busy',
+ 'srv_telephone_status_Z2' => 'Busy',
'srv_telephone_status_N' => '»N« - No answer - Offline',
+ 'srv_telephone_status_N2' => '»No answer',
'srv_telephone_status_D' => '»D« - Delayed',
+ 'srv_telephone_status_D2' => 'Delayed',
'srv_telephone_add_sample' => "000 111 222,John,Smith 000 333 444,,Smith,",
'srv_telephone_call_start' => 'Start calling',
'srv_telephone_call_available' => 'Number of available telephone numbers:',
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index c4a2e0eef..ad5e9e2f1 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -20319,6 +20319,7 @@ dl.arch_email dd {
div.page_telephone div.phone_settings_top div#inv_top_navi {
display: flex;
flex-direction: row;
+ justify-content: space-between;
margin-bottom: 42px;
}
div.page_telephone div.phone_settings_top div#inv_top_navi div.phn_step_nav {
@@ -20332,7 +20333,7 @@ div.page_telephone div.phone_settings_top div#inv_top_navi div.phn_step_nav div.
cursor: pointer;
}
div.page_telephone div.phone_settings_top div#inv_top_navi div.phn_step_nav div.phn_step.menu {
- color: #C4C4C4;
+ color: #777777;
}
div.page_telephone div.phone_settings_top div#inv_top_navi div.phn_step_nav div.phn_step.menu div.label:after {
content: "";
@@ -20378,11 +20379,23 @@ div.page_telephone div.phone_settings_top div#inv_top_navi div.phn_step_nav div.
color: inherit;
text-decoration: none;
}
-div.page_telephone div.phone_settings_top div#inv_top_navi div.phn_step_nav div.phn_step.settings {
- margin-right: 32px;
+div.page_telephone div.phone_settings_top div#tel_settings_holder {
+ display: flex;
+ flex-direction: row;
+ gap: 32px;
+ color: #777777;
+}
+div.page_telephone div.phone_settings_top div#tel_settings_holder span.faicon {
+ margin-right: 8px;
+}
+div.page_telephone div.phone_settings_top div#tel_settings_holder div.phn_step_nav.active {
+ color: #1E88E5;
}
div.page_telephone h2 {
- font-weight: 300;
+ font-weight: 700;
+ color: #1E88E5;
+ text-transform: uppercase;
+ font-size: 16px;
}
div.page_telephone div#inv_import {
display: flex;
@@ -20467,11 +20480,17 @@ div.page_telephone div#inv_import fieldset#inv_import_list_container div.button_
div.page_telephone div#inv_import fieldset#inv_import_list_container div.button_holder button:last-of-type {
margin-right: 0;
}
-div.page_telephone div#inv_rec_filter {
+div.page_telephone div#filter_wrap {
+ display: flex;
+ flex-direction: row;
+ gap: 16px;
+ align-items: center;
+}
+div.page_telephone div#filter_wrap div#inv_rec_filter {
border: none;
padding: 0;
}
-div.page_telephone div#inv_rec_filter input {
+div.page_telephone div#filter_wrap div#inv_rec_filter input {
margin: 0;
height: 42px;
}
@@ -20488,6 +20507,7 @@ div.page_telephone div#inv_bottom_edit {
}
div.page_telephone div#inv_bottom_edit a {
text-decoration: none;
+ margin-right: 16px;
}
div.page_telephone table#phn_call_table td, div.page_telephone table#phn_call_table th {
border: none;
@@ -20504,6 +20524,20 @@ div.page_telephone table#phn_call_table td:first-of-type, div.page_telephone tab
div.page_telephone table#phn_call_table td:last-of-type, div.page_telephone table#phn_call_table th:last-of-type {
padding-right: 0;
}
+div.page_telephone table#phn_call_table td div.pregled_klicev, div.page_telephone table#phn_call_table th div.pregled_klicev {
+ display: flex;
+ flex-direction: column;
+ font-size: 14px;
+ width: 100%;
+}
+div.page_telephone table#phn_call_table td div.pregled_klicev div#top, div.page_telephone table#phn_call_table th div.pregled_klicev div#top {
+ display: flex;
+ flex-direction: row;
+ justify-content: space-between;
+}
+div.page_telephone table#phn_call_table td div.pregled_klicev div#top div#status, div.page_telephone table#phn_call_table th div.pregled_klicev div#top div#status {
+ font-weight: 600;
+}
div.page_telephone table#phn_call_table th {
text-transform: uppercase;
padding-bottom: 16px;
@@ -20520,6 +20554,19 @@ div.page_telephone div#phn_user_comment {
border-radius: 2px;
margin-top: 4px;
}
+div.page_telephone div#tel_line_wrap {
+ display: flex;
+ flex-direction: row;
+ gap: 16px;
+ align-items: center;
+ margin-top: 32px;
+}
+div.page_telephone div#tel_line_wrap0 {
+ display: flex;
+ flex-direction: row;
+ gap: 16px;
+ align-items: center;
+}
div.prevajanje_holder .section {
margin: 0 16px 16px 16px;
diff --git a/resources/sass/admin_new/pages/survey_edit/telefonska_anketa.scss b/resources/sass/admin_new/pages/survey_edit/telefonska_anketa.scss
index 1c359c85a..40a0eb517 100644
--- a/resources/sass/admin_new/pages/survey_edit/telefonska_anketa.scss
+++ b/resources/sass/admin_new/pages/survey_edit/telefonska_anketa.scss
@@ -7,6 +7,7 @@ div.page_telephone {
display: flex;
flex-direction: row;
+ justify-content: space-between;
margin-bottom: 42px;
@@ -25,7 +26,7 @@ div.page_telephone {
&.menu {
- color: $dark-gray;
+ color: $very-dark-gray;
div.label {
@@ -89,17 +90,34 @@ div.page_telephone {
color: inherit;
text-decoration: none;
}
-
- &.settings {
- margin-right: 32px;
- }
+ }
+ }
+ }
+
+ div#tel_settings_holder {
+ display: flex;
+ flex-direction: row;
+ gap: 32px;
+
+ color: $very-dark-gray;
+
+ span.faicon {
+ margin-right: 8px;
+ }
+
+ div.phn_step_nav {
+ &.active {
+ color: $blue;
}
}
}
}
h2 {
- font-weight: $light;
+ font-weight: 700;
+ color: $blue;
+ text-transform: uppercase;
+ font-size: 16px;
}
//Dodaj
@@ -214,16 +232,23 @@ div.page_telephone {
//Preglej
- div#inv_rec_filter {
- border: none;
- padding: 0;
+ div#filter_wrap{
- input {
- margin: 0;
- height: 42px;
+ display: flex;
+ flex-direction: row;
+ gap: 16px;
+ align-items: center;
+
+ div#inv_rec_filter {
+ border: none;
+ padding: 0;
+
+ input {
+ margin: 0;
+ height: 42px;
+ }
}
}
-
table {
td {
div.icons {
@@ -243,6 +268,7 @@ div.page_telephone {
a {
text-decoration: none;
+ margin-right: 16px;
}
}
@@ -265,6 +291,23 @@ div.page_telephone {
&:last-of-type {
padding-right: 0;
}
+
+ div.pregled_klicev {
+ display: flex;
+ flex-direction: column;
+ font-size: 14px;
+ width: 100%;
+
+ div#top {
+ display:flex;
+ flex-direction: row;
+ justify-content: space-between;
+
+ div#status {
+ font-weight: $semi-bold;
+ }
+ }
+ }
}
th {
@@ -289,4 +332,21 @@ div.page_telephone {
border-radius: 2px;
margin-top: 4px;
}
+
+ // Čakalna vrsta
+ div#tel_line_wrap {
+ display: flex;
+ flex-direction: row;
+ gap: 16px;
+ align-items: center;
+
+ margin-top: 32px;
+ }
+
+ div#tel_line_wrap0 {
+ display: flex;
+ flex-direction: row;
+ gap: 16px;
+ align-items: center;
+ }
}
\ No newline at end of file