Переглянути джерело

moving client calculation to server for some browser does not support getWeekDay

master
patrick 6 роки тому
джерело
коміт
b40bd3db3a
2 змінених файлів з 28 додано та 12 видалено
  1. +24
    -1
      UserJob.php
  2. +4
    -11
      js/feedback_card.js

+ 24
- 1
UserJob.php Переглянути файл

if ($this->db->last_error == ""){ if ($this->db->last_error == ""){
$response['status'] = 'success'; $response['status'] = 'success';
foreach( $jobs as $s){ foreach( $jobs as $s){
$response['jobs'][] = array(
$el = array(
'id' => $s->id, 'id' => $s->id,
'tos' => $s->tos, 'tos' => $s->tos,
'start'=> $s->start, 'start'=> $s->start,
'rate_str'=> $this->get_rate_str($s->rate), 'rate_str'=> $this->get_rate_str($s->rate),
'tos_str'=> $this->get_tos_str($s->tos), 'tos_str'=> $this->get_tos_str($s->tos),
'staff_name' => $this->get_display_name($s->staff), 'staff_name' => $this->get_display_name($s->staff),
//extra field for GUI
'hl_start_date' => $this->get_date_month($s->start),
'hl_start' => $this->get_hh_mm($s->start),
'hl_finish' => $this->get_hh_mm($s->finish),
'rated' => ($s->rating >=1 && $s->rating<=5)? 'rated': '',
'start_day' => $this->get_weekday_name($s->start),
'finish_day' => $this->get_weekday_name($s->finish),
); );
$el['checked_' . $s->rating] = 'checked';
$response['jobs'][]=$el;
} }
}else{ }else{
} }
return $response; return $response;
} }
private function get_date_month($strdate){
$d = new \DateTime($strdate);
return $d->format('d/n');
}
private function get_hh_mm($strdate){
$d = new \DateTime($strdate);
return $d->format('H:i');
}

private function get_weekday_name($strdate){
$d = new \DateTime($strdate);
return $d->format("D");
}
private function get_rate_str($earnings_rate_id) private function get_rate_str($earnings_rate_id)
{ {

+ 4
- 11
js/feedback_card.js Переглянути файл

finish: get_finish_date(), finish: get_finish_date(),
}, function(response, status, xhr){ }, function(response, status, xhr){
if (response.status == "success"){ if (response.status == "success"){
pre_process(response);
//pre_process(response);
load_client_jobs(response); load_client_jobs(response);
}else{ }else{
display_error(response); display_error(response);
$.each(response.jobs, function(idx, val){ $.each(response.jobs, function(idx, val){


val.hl_start_date = get_hl_start_date(val.start); val.hl_start_date = get_hl_start_date(val.start);
val.hl_start = get_hl_start(val.start);
val.hl_finish = get_hl_finish(val.finish);
val.hl_start = get_hh_mm(val.start);
val.hl_finish = get_hh_mm(val.finish);
val.checked_1 = get_checked(1, val.rating); val.checked_1 = get_checked(1, val.rating);
val.checked_2 = get_checked(2, val.rating); val.checked_2 = get_checked(2, val.rating);
m = s.getMonth() + 1; m = s.getMonth() + 1;
return dd +"/" + m; return dd +"/" + m;
} }
function get_hl_start(start)
{
return get_hh_mm(start);
}
function get_hl_finish(finish)
{
return get_hh_mm(finish);
}

function get_hh_mm(date){ function get_hh_mm(date){
var s = new Date(date); var s = new Date(date);
var hh = s.getHours(); var hh = s.getHours();

Завантаження…
Відмінити
Зберегти