may/1KA_F2F
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Redizajn 1KA] - Urejanje --> Nastavitve --> Telefonska anketa - v2 // preglej + začni + čakalna vrsta

Browse Source
This commit is contained in:
tejagerjovic 2022-04-14 05:08:56 +02:00
parent 03d0ea3a9e
commit 9652448a94
5 changed files with 189 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
admin/survey/classes/class.SurveyTelephone.php
View File

@ -670,7 +670,7 @@ class SurveyTelephone {
# če že imamo prejemnike v bazi ponudimo gumb naprej
echo '<button class="medium blue" onclick="phn_add_recipients(); return false;">'.$lang['srv_telephone_add'].'</button>';
echo '</div>';
echo '</fieldset>'; # id=inv_import_list_container
echo '</div>'; # id=inv_import
}
@ -802,6 +802,8 @@ class SurveyTelephone {
echo '</div>';
#space
echo '<div id="tel_settings_holder">';
// Cakalni seznam
echo '<div class="phn_step_nav'.$active_step[6].'">';
@ -812,6 +814,9 @@ class SurveyTelephone {
echo '</div>';
echo '</div>';
}
else {
echo '<div id="tel_settings_holder">';
}
// Nastavitve
echo '<div class="phn_step_nav'.$active_step[5].'">';
@ -829,6 +834,8 @@ class SurveyTelephone {
echo '</a>';
echo '</div>';
echo '</div>';
echo '</div>';
}
}
}
@ -841,9 +848,8 @@ class SurveyTelephone {
// Najprej cakalna vrsta (stevilke ki se bodo prikazale kasneje)
$this->waitingList();
echo '<br /><br />';
// Se vrsta stevilk ki se trenutno klicejo
echo '<div id="tel_line_wrap">';
echo '<h2>'.$lang['srv_telephone_navi_calling_list'].'</h2>';
// Dobimo seznam vseh ki se niso bili klicani
@ -931,16 +937,16 @@ class SurveyTelephone {
// Stevilo stevilk v vrsti
echo '<div id="srv_invitation_note">'.$lang['srv_telephone_calling_list_count'].': '.count($toCall).'</div>';
echo '<br class="clr"/>';
echo '</div>';
// Izrisemo tabelo
echo '<div style="display:inline-block;">';
echo '<div class="table-horizontal-scroll-wrapper1">';
echo '<div class="table-horizontal-scroll-wrapper2">';
echo '<table id="tbl_recipients_list" class="phone">';
// Header tabele
echo '<tr>';
echo '<th class="tbl_icon">&nbsp;</th>';
echo '<th class="tbl_icon"></th>';
foreach ($fields AS $fkey =>$field) {
if ($field == 1) {
if ($fkey == 'sent' || $fkey == 'responded' || $fkey == 'unsubscribed'){
@ -1019,7 +1025,7 @@ class SurveyTelephone {
case 'ps_icon':
echo '<td class="anl_ac'.$icon.'" onclick="phnGoToUser(\''.$sql_row['id'].'\')">';
echo '&nbsp;';
echo '<span class="faicon blue phone pointer"></span>';
echo '</td>';
break;
case 'last_status':
@ -1091,12 +1097,11 @@ class SurveyTelephone {
echo '</table>';
echo '</div>';
echo '</div>';
}
else {
echo $lang['srv_telephone_calling_list_empty'].'<br class="clr">';
}
echo '<br /><br /><br />';
}
// Seznam stevilk ki so v vrsti za klicanje
@ -1104,6 +1109,7 @@ class SurveyTelephone {
global $lang;
global $site_url;
echo '<div id="tel_line_wrap0">';
echo '<h2>'.$lang['srv_telephone_navi_waiting_list'].'</h2>';
@ -1192,11 +1198,12 @@ class SurveyTelephone {
// Stevilo stevilk v vrsti
echo '<div id="srv_invitation_note">'.$lang['srv_telephone_waiting_list_count'].': '.count($toCall).'</div>';
echo '</div>';
echo '<br class="clr"/>';
// Izrisemo tabelo
echo '<div style="display:inline-block;">';
echo '<div class="table-horizontal-scroll-wrapper1">';
echo '<div class="table-horizontal-scroll-wrapper2">';
echo '<table id="tbl_recipients_list" class="phone">';
// Header tabele
@ -1280,7 +1287,7 @@ class SurveyTelephone {
case 'ps_icon':
echo '<td class="anl_ac'.$icon.'" onclick="phnGoToUser(\''.$sql_row['id'].'\')">';
echo '&nbsp;';
echo '<span class="blue faicon phone pointer"></span>';
echo '</td>';
break;
case 'last_status':
@ -1352,6 +1359,7 @@ class SurveyTelephone {
echo '</table>';
echo '</div>';
echo '</div>';
}
else {
echo $lang['srv_telephone_waiting_list_empty'].'<br class="clr">';
@ -1536,6 +1544,8 @@ class SurveyTelephone {
}
if ($count_all > 0 ) {
echo '<div id="filter_wrap">';
// dodamo filtriranje
echo '<div id="inv_rec_filter">';
echo '<input id="tel_rec_filter_value" type="text" class="text large" placeholder="'.$lang['srv_invitation_recipients_filter'].'" value="'.$_SESSION['inv_filter']['value'].'">';
@ -1560,6 +1570,7 @@ class SurveyTelephone {
echo $lang['srv_invitation_num_respondents'].(int)$this->count_all;
}
echo '</div>';
echo '</div>';
if (mysqli_num_rows($sql_query_filterd) > 0 && $count_all > 0) {
@ -1627,7 +1638,7 @@ class SurveyTelephone {
echo '<tr>';
# checkbox
echo '<td><div class="icons"><input type="checkbox" name="inv_rids[]" value="'.$sql_row['id'].'"><label class="empty"></label>';
echo '<td><div class="icons"><input type="checkbox" id="'.$sql_row['id'].'" name="inv_rids[]" value="'.$sql_row['id'].'"><label for="'.$sql_row['id'].'" class="empty"></label>';
#izbriši
echo '<span class="faicon trash empty blue" onclick="deleteRecipient_confirm(\''.$sql_row['id'].'\'); return false;" title="'.$lang['srv_inv_list_profiles_delete'].'"></span>';
#uredi
@ -1715,11 +1726,11 @@ class SurveyTelephone {
echo '</div>';
echo '</div>';
echo '<div id="inv_bottom_edit">';
echo '<span class="faicon arrow_up blue"></span> ';
echo '<span id="inv_switch_on"><a href="javascript:inv_selectAll(true);">'.$lang['srv_select_all'].'</a></span>';
echo '<span id="inv_switch_off" style="display:none;"><a href="javascript:inv_selectAll(false);">'.$lang['srv_deselect_all'].'</a></span>';
echo '&nbsp;&nbsp;<a href="#" onClick="inv_recipients_form_action(\'delete\');"><span class="faicon trash empty blue" title="'.$lang['srv_invitation_recipients_delete_selected'].'"/></span>&nbsp;'.$lang['srv_invitation_recipients_delete_selected'].'</a>';
echo '&nbsp;&nbsp;<a href="#" onClick="inv_recipients_form_action(\'export\');"><span class="faicon xls" title="'.$lang['srv_invitation_recipients_export_selected'].'"/></span>&nbsp;'.$lang['srv_invitation_recipients_export_selected'].'</a>';
/*echo '<a href="javascript:inv_selectAll(true);"><span class="faicon arrow_up blue"></span> ';
echo '<span id="inv_switch_on">'.$lang['srv_select_all'].'</a></span>';
echo '<span id="inv_switch_off" style="display:none;"><a href="javascript:inv_selectAll(false);">'.$lang['srv_deselect_all'].'</a></span>';*/
echo '<a href="#" onClick="inv_recipients_form_action(\'delete\');"><span class="faicon trash empty blue" title="'.$lang['srv_invitation_recipients_delete_selected'].'"/></span>&nbsp;'.$lang['srv_invitation_recipients_delete_selected'].'</a>';
echo '<a href="#" onClick="inv_recipients_form_action(\'export\');"><span class="faicon xls" title="'.$lang['srv_invitation_recipients_export_selected'].'"/></span>&nbsp;'.$lang['srv_invitation_recipients_export_selected'].'</a>';
echo '</div>';
echo '</div>';
@ -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 '<p>'.$insert_time.' - <strong>'.$lang['srv_telephone_status_'.$status].'</strong></p>';
echo '<div class="pregled_klicev">';
echo '<div id="top">';
echo '<div id="datum">';
echo $insert_time;
echo '</div>';
echo '<div id="status">';
echo $lang['srv_telephone_status_'.$status.'2'];
echo '</div>';
echo '</div>';
echo '<div id="comment">';
echo '</div>';
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 '</td>';
echo '<td>';

12
lang/1.php
View File

@ -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,<br/>000 333 444,,Novak",
'srv_telephone_call_start' => 'Začni s klicanjem',
'srv_telephone_call_available' => 'Prostih telefonskih številk na voljo:',

14
lang/2.php
View File

@ -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<br/>000 333 444,,Smith,",
'srv_telephone_call_start' => 'Start calling',
'srv_telephone_call_available' => 'Number of available telephone numbers:',

59
public/css/admin_new.css
View File

@ -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;

86
resources/sass/admin_new/pages/survey_edit/telefonska_anketa.scss
View File

@ -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;
}
}