diff --git a/NdisPrice.php b/NdisPrice.php
new file mode 100644
index 0000000..3b10982
--- /dev/null
+++ b/NdisPrice.php
@@ -0,0 +1,52 @@
+<?php
+
+namespace Biukop;
+
+class NdisPrice{
+    private $html = '';
+    private $ndis_table; 
+    public function __construct(int $year=2019) {
+        global $wpdb;
+        $this->ndis_table = $wpdb->prefix . 'acare_ndis_price';
+        $sql = "SELECT * FROM {$this->ndis_table} WHERE year=$year"; //for this year
+        $results = $wpdb->get_results($sql);
+        $html = '            	<select>';
+        foreach($results as $r){
+            
+            $html .= sprintf('<option value="%s" data-level="%d" data-year="%d"  data-unit="%s" data-price="%.2f" data-ot="%s">%.2f - %s %s %s</option>',
+                $r->code,
+                $r->level,
+                (int) $r->year,
+                $r->unit,
+                (float) $r->price,
+                $r->ot,
+                (float) $r->price,
+                $r->name,
+                $this->get_level((int) $r->level),
+                $r->ot
+             );//end of sprintf
+        }
+        $html .='    	</select>';
+        $this->html = $html;
+    }
+    
+    private function get_level($level_number){
+        $levelStr = array(
+            0 => '(standard)',
+           -1 => '', //no level number needed
+            1 => '(Level 1)',
+            2 => '(Level 2)',
+            3 => '(Level 3)'
+        );
+        
+        if ( array_key_exists($level_number, $levelStr) )
+            return $levelStr[$level_number];
+        else 
+            return '';
+    }
+    
+    public function get_html()
+    {
+        return $this->html;
+    }
+}
\ No newline at end of file
diff --git a/js/bts_timesheet.js b/js/bts_timesheet.js
index e16b8df..3377e25 100644
--- a/js/bts_timesheet.js
+++ b/js/bts_timesheet.js
@@ -646,18 +646,21 @@
 			
 			is_week1()
 			{
-				var w1_begin = $('span[name="w1d1"]').data().date;
+				var w1_begin = new Date($('span[name="w1d1"]').data().date) ;
 				var w1_end = new Date($('span[name="w1d7"]').data().date);
-				w1_end = new Date (w1_end.setDate(w1_end.getDate()+1)); //from 00:00 to 23:59;
+				w1_begin.setHours(0,0,0,0);
+				w1_end.setHours(23,59,59);
+				//w1_end = new Date (w1_end.setDate(w1_end.getDate()+1)); //from 00:00 to 23:59;
 				var me = new Date(this.data.start);
 				return (w1_begin <= me && me <= w1_end );
 			}
 			
 			is_week2()
 			{
-				var w2_begin = $('span[name="w2d1"]').data().date;
+				var w2_begin = new Date($('span[name="w2d1"]').data().date);
 				var w2_end = new Date($('span[name="w2d7"]').data().date);
-				w2_end = new Date (w2_end.setDate(w2_end.getDate()+1)); //from 00:00 to 23:59;
+				w2_begin.setHours(0,0,0,0);
+				w2_end.setHours(23,59,59);
 				var me = new Date(this.data.start);
 				return (w2_begin <= me && me <= w2_end );
 			}
diff --git a/ts.php b/ts.php
index b37adbc..75e5cc7 100644
--- a/ts.php
+++ b/ts.php
@@ -268,18 +268,8 @@ class AcareOffice{
     }
     
     public function bts_type_of_service($attr){
-        $result = '            	<select>
-            		<option value="personalcare">Personal Care (stanard)</option>
-            		<option value="personalcare_h">Personal Care(Complex)</option>
-            		<option value="lunch">Lunch (stanard)</option>
-            		<option value="lunch_h">Lunch(Complex)</option>
-            		<option value="community">Community(stanard)</option>
-            		<option value="community_h">Community(Complex)</option>
-            		<option value="turn">Turn(stanard)</option>
-            		<option value="turn_h">Turn(Complex)</option>
-            	</select>
-              ';
-        return $result;
+        $n = new NdisPrice(2019);
+        return $n->get_html();
     }
     
     public function bts_user_name($attr)
@@ -338,7 +328,7 @@ class AcareOffice{
             'users' => [],
         );
         //search all users that are staff
-        $clientq = new \WP_User_Query(array('role'=>'client', 'meta_key'=>'first_name', 'orderby'=>'meta_value', order=>'ASC'));
+        $clientq = new \WP_User_Query(array('role'=>'client', 'meta_key'=>'first_name', 'orderby'=>'meta_value', 'order'=>'ASC'));
         $client = $clientq->get_results();
         if (! empty($client)){
             $response['status'] = 'success';
@@ -363,7 +353,7 @@ class AcareOffice{
     
     private function get_people_by_role($role){
         //search all users that are staff
-        $staffq = new \WP_User_Query(array('role'=>$role, 'meta_key'=>'first_name', 'orderby'=>'meta_value', order=>'ASC'));
+        $staffq = new \WP_User_Query(array('role'=>$role, 'meta_key'=>'first_name', 'orderby'=>'meta_value', 'order'=>'ASC'));
         $staff = $staffq->get_results();
         return $staff;
     }