\ No newline at end of file
diff --git a/js/bts_timesheet.js b/js/bts_timesheet.js
index 185d431..5302053 100644
--- a/js/bts_timesheet.js
+++ b/js/bts_timesheet.js
@@ -213,6 +213,13 @@
else
$('div.wifi i').hide();
}
+ function csv(t){
+ if (t)
+ $('div.csv i').show();
+ else
+ $('div.csv i').hide();
+ }
+
function init_user_search(){
$('div.b_search input').keyup(debounce(function(e){
@@ -858,31 +865,45 @@
function init_weekdays(){
var curr = new Date; // get current date
- // First day is the day of the month - the day of the week
+ init_weekdays_by_anchor(curr, true);
+ return;
+ }
+
+ function init_weekdays_by_anchor(anchor, is_week1){
+ var curr = new Date(anchor); // get the date;
+
+ if (!is_week1){ //it is week2, shift for 7 days;
+ curr.setDate(curr.getDate() -7); //curr will be changed;
+ }
+
var first = curr.getDate() - curr.getDay() + 1; //+1 we want Mon as first
var last = first + 6; // last day is the first day + 6
-
- //var firstday = new Date(curr.setDate(first)); //Mon
- //var lastday = new Date(curr.setDate(last)); //Sun
+
+ if (curr.getDay() == 0 ){// it's Sunday;
+ last = curr.getDate();
+ first = last - 6;
+ }
+
var pos = 1; //first lot
for (var i=first; i<=last; i++)
{
- var now = new Date;
+ var now = new Date(curr);
var d1 = new Date(now.setDate(i));
- now = new Date;
+ now = new Date(curr);
var d2 = new Date(now.setDate(i+7));
set_day_number(1,pos, d1); //week 1
set_day_number(2,pos, d2); //week 2
pos +=1;
}
}
+
function set_day_number(week, index, date){
var selector = 'span[name="w'+week+'d'+index+'"]';
$(selector).html(date.getDate());
$(selector).data({date:date});
- console.log('set w%d-d%d %o', week,index,date);
+ //console.log('set w%d-d%d %o', week,index,date);
}
function set_today(){
@@ -905,6 +926,16 @@
var num = date.get_week_number();
$('div.weekly span[name="week1"]').html(num);
$('div.weekly span[name="week2"]').html(num+1);
+
+ set_week_boundry();
+ }
+
+ function set_week_boundry()
+ {
+ var date = $('span[name="w1d1"]').data().date;
+ $('#week1b').attr('value', format_date(date));
+ var date = $('span[name="w2d7"]').data().date;
+ $('#week2b').attr('value', format_date(date));
}
function number_of_unsaved_job(){
@@ -928,7 +959,7 @@
$(e).data({data:newdate});
});
set_week_number();
- load_timesheet();
+ debounced_load_timesheet();
});
$('div.nextweek.right').click(function(){
if (number_of_unsaved_job() > 0){
@@ -943,9 +974,19 @@
$(e).data({data:newdate});
});
set_week_number();
- load_timesheet();
+ debounced_load_timesheet();
});
+ $('div.weekly div.weekname.prev >input ').click(function(e){
+ e.stopPropagation();
+ });
+ $('div.weekly div.weekname.prev >input ').change(function(e){
+ var date = $('#week1b').attr('value');
+ init_weekdays_by_anchor(date, true);
+ set_week_number();
+ debounced_load_timesheet();
+ });
+
$('div.weekly div.weekname.prev').click(function(){
if (!confirm ('copy entire week to next week? '))
return;
@@ -970,11 +1011,25 @@
show_jobs(job_els);
debounced_calculate();
});
+
+ $('div.weekly div.weekname.next > input').click(function(e){
+ e.stopPropagation();
+ });
- $('div.weekly div.weekname.next').click(function(){
- alert('you can only copy from past to future (left to right)');
+ $('div.weekly div.weekname.next >input ').change(function(e){
+ e.stopPropagation();
+ var date = $('#week2b').attr('value');
+ init_weekdays_by_anchor(date, false);
+ set_week_number();
+ debounced_load_timesheet();
+ });
+
+
+ $('div.weekly div.weekname.next').click(function(e){
+ $(e).find('input').trigger('click');
});
+
$('div.week1 > div').click(function(e){
e.stopPropagation();
if ($('div.bstart input.blink_me').length == 0){
@@ -1066,7 +1121,7 @@
$('div.bstart input').removeClass('blink_me');
}
- $('div.sheettitle h1').click(function(){
+ $('div.sheettitle h1 span').click(function(){
reset_title_to_today();
load_timesheet();
});
@@ -1077,6 +1132,7 @@
set_week_number();
}
+ var debounced_load_timesheet = debounce(load_timesheet,1000);
function load_timesheet()
{
@@ -1340,6 +1396,7 @@
list_clients();
xero(false);
wifi(false);
+ csv(false);
init_user_search();
//ajax_earning_rate();
reset_title_to_today();
@@ -1411,7 +1468,8 @@
// }
init_ts();
-
+// $( "#week1b" ).datepicker("option", "dateFormat", "yy-mm-dd");
+// $( "#week2b" ).datepicker("option", "dateFormat", "yy-mm-dd");
/*________________________________________________________________________*/
});
diff --git a/js/feedback_card.js b/js/feedback_card.js
index c11c7ca..dc3278f 100644
--- a/js/feedback_card.js
+++ b/js/feedback_card.js
@@ -160,9 +160,14 @@
function get_this_week_start(){
var curr = new Date; // get current date
- // First day is the day of the month - the day of the week
var first = curr.getDate() - curr.getDay() + 1; //+1 we want Mon as first
var last = first + 6; // last day is the first day + 6
+ // First day is the day of the month - the day of the week
+ if(curr.getDay()==0)//sunday
+ {
+ last = curr.getDate();
+ first = last - 6;
+ }
var firstday = new Date(curr.setDate(first)); //Mon
firstday.setHours(0,0,0);
diff --git a/ts.php b/ts.php
index eebc770..e3c225c 100644
--- a/ts.php
+++ b/ts.php
@@ -47,6 +47,8 @@ class AcareOffice{
add_shortcode( 'bts_type_of_service', array($this, 'bts_type_of_service'));
add_shortcode( 'bts_staff_job_summary', array($this, 'bts_staff_job_summary'));
add_shortcode( 'bts_feedback_card', array($this, 'bts_feedback_card'));
+ add_shortcode( 'bb_timesheet_canvas', array($this, 'bb_timesheet_canvas'));
+
//user profile page
add_shortcode( 'bts_user_name', array($this,'bts_user_name'));
@@ -553,7 +555,10 @@ class AcareOffice{
{
return $this->template('bts_feedback_card', 'feedback_card.html');
}
-
+ public function bb_timesheet_canvas($attr)
+ {
+ return file_get_contents(plugin_dir_path(__FILE__) . "/html/timesheet.html");
+ }
//generate template based on html file
private function template($id, $file)
{