[changed] code cleanup in the massuese scheduler

locations/masseuse_schedule.qsrc

@@ -68,9 +68,9 @@ end
 
 if $ARGS[0] = 'start':
 
-act'Finish scheduling':gt'salon','start'
-
-	if masseuse['new_job_week'] <= daystart: gt'masseuse_schedule','schedule_reset'
+	act'Finish scheduling':gt'salon','start'
+	
+    if masseuse['new_job_week'] <= daystart: gt'masseuse_schedule','schedule_reset'
 
 	'<Table border=1><TR><TH>Sunday</TH> <TH>Monday</TH> <TH>Tuesday</TH> <TH>Wednesday</TH> <TH>Thursday</TH> <TH>Friday</TH> <TH>Saturday</TH></TR>'
 
@@ -79,91 +79,91 @@ act'Finish scheduling':gt'salon','start'
 !! First Sunday Shift
 	*P '<tr><td>' 
 	if masseuse['7_shift_1'] = 0 and masseuse['7_shift_1_taken'] < 2:
-		'<a href="exec:masseuse[''7_shift_check''] = 7 & masseuse[''7_shift_1''] = 1 & gt''masseuse_schedule'',''start''"> 09:00-13:00 shift</a>'
+		'<a href="exec:masseuse[''7_shift_1''] = 1 & gt''masseuse_schedule'',''start''"> 09:00-13:00 shift</a>'
 	elseif masseuse['7_shift_1_taken'] = 2:
 		'09:00-13:00 shift'
 		'<i>not available</i>'
 	else
 		'09:00-13:00 shift'
-		'<a href="exec:masseuse[''7_shift_check''] = 0 & masseuse[''7_shift_1''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
+		'<a href="exec:masseuse[''7_shift_1''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
 	end
 	'</td><td>'
 
 !! First Monday Shift
 
 	if masseuse['1_shift_1'] = 0 and masseuse['1_shift_1_taken'] < 2:
-		'<a href="exec:masseuse[''1_shift_check''] = 1 & masseuse[''1_shift_1''] = 1 & gt''masseuse_schedule'',''start''"> 09:00-13:00 shift</a>'
+		'<a href="exec:masseuse[''1_shift_1''] = 1 & gt''masseuse_schedule'',''start''"> 09:00-13:00 shift</a>'
 	elseif masseuse['1_shift_1_taken'] = 2:
 		'09:00-13:00 shift'
 		'<i>not available</i>'
 	else
 		'09:00-13:00 shift'
-		'<a href="exec:masseuse[''1_shift_check''] = 0 & masseuse[''1_shift_1''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
+		'<a href="exec:masseuse[''1_shift_1''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
 	end
 	'</td><td>'
 
 !! First Tuesday Shift
 
 	if masseuse['2_shift_1'] = 0 and masseuse['2_shift_1_taken'] < 2:
-		'<a href="exec:masseuse[''2_shift_check''] = 2 & masseuse[''2_shift_1''] = 1 & gt''masseuse_schedule'',''start''"> 09:00-13:00 shift</a>'
+		'<a href="exec:masseuse[''2_shift_1''] = 1 & gt''masseuse_schedule'',''start''"> 09:00-13:00 shift</a>'
 	elseif masseuse['2_shift_1_taken'] = 2:
 		'09:00-13:00 shift'
 		'<i>not available</i>'
 	else
 		'09:00-13:00 shift'
-		'<a href="exec:masseuse[''2_shift_check''] = 0 & masseuse[''2_shift_1''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
+		'<a href="exec:masseuse[''2_shift_1''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
 	end
 	'</td><td>'
 
 !! First Wednesday Shift
 
 	if masseuse['3_shift_1'] = 0 and masseuse['3_shift_1_taken'] < 2:
-		'<a href="exec:masseuse[''3_shift_check''] = 3 & masseuse[''3_shift_1''] = 1 & gt''masseuse_schedule'',''start''"> 09:00-13:00 shift</a>'
+		'<a href="exec:masseuse[''3_shift_1''] = 1 & gt''masseuse_schedule'',''start''"> 09:00-13:00 shift</a>'
 	elseif masseuse['3_shift_1_taken'] = 2:
 		'09:00-13:00 shift'
 		'<i>not available</i>'
 	else
 		'09:00-13:00 shift'
-		'<a href="exec:masseuse[''3_shift_check''] = 0 & masseuse[''3_shift_1''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
+		'<a href="exec:masseuse[''3_shift_1''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
 	end
 	'</td><td>'
 
 !! First Thursday Shift
 
 	if masseuse['4_shift_1'] = 0 and masseuse['4_shift_1_taken'] < 2:
-		'<a href="exec:masseuse[''4_shift_check''] = 4 & masseuse[''4_shift_1''] = 1 & gt''masseuse_schedule'',''start''"> 09:00-13:00 shift</a>'
+		'<a href="exec:masseuse[''4_shift_1''] = 1 & gt''masseuse_schedule'',''start''"> 09:00-13:00 shift</a>'
 	elseif masseuse['4_shift_1_taken'] = 2:
 		'09:00-13:00 shift'
 		'<i>not available</i>'
 	else
 		'09:00-13:00 shift'
-		'<a href="exec:masseuse[''4_shift_check''] = 0 & masseuse[''4_shift_1''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
+		'<a href="exec:masseuse[''4_shift_1''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
 	end
 	'</td><td>'
 
 !! First Friday Shift
 	
 	if masseuse['5_shift_1'] = 0 and masseuse['5_shift_1_taken'] < 2:
-		'<a href="exec:masseuse[''5_shift_check''] = 5 & masseuse[''5_shift_1''] = 1 & gt''masseuse_schedule'',''start''"> 09:00-13:00 shift</a>'
+		'<a href="exec:masseuse[''5_shift_1''] = 1 & gt''masseuse_schedule'',''start''"> 09:00-13:00 shift</a>'
 	elseif masseuse['5_shift_1_taken'] = 2:
 		'09:00-13:00 shift'
 		'<i>not available</i>'
 	else
 		'09:00-13:00 shift'
-		'<a href="exec:masseuse[''5_shift_check''] = 0 & masseuse[''5_shift_1''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
+		'<a href="exec:masseuse[''5_shift_1''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
 	end
 	'</td><td>'
 
 !! First Saturday Shift
 
 	if masseuse['6_shift_1'] = 0 and masseuse['6_shift_1_taken'] < 2:
-		'<a href="exec:masseuse[''6_shift_check''] = 6 & masseuse[''6_shift_1''] = 1 & gt''masseuse_schedule'',''start''"> 09:00-13:00 shift</a>'
+		'<a href="exec:masseuse[''6_shift_1''] = 1 & gt''masseuse_schedule'',''start''"> 09:00-13:00 shift</a>'
 	elseif masseuse['6_shift_1_taken'] = 2:
 		'09:00-13:00 shift'
 		'<i>not available</i>'
 	else
 		'09:00-13:00 shift'
-		'<a href="exec:masseuse[''6_shift_check''] = 0 & masseuse[''6_shift_1''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
+		'<a href="exec:masseuse[''6_shift_1''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
 	end
 	'</td></tr>'
 	
@@ -173,91 +173,91 @@ act'Finish scheduling':gt'salon','start'
 !! Second Sunday Shift
 	*P '<tr><td>' 
 	if masseuse['7_shift_2'] = 0 and masseuse['7_shift_2_taken'] < 2:
-		'<a href="exec:masseuse[''7_shift_check''] = 7 & masseuse[''7_shift_2''] = 1 & gt''masseuse_schedule'',''start''"> 13:00-17:00 shift</a>'
+		'<a href="exec:masseuse[''7_shift_2''] = 1 & gt''masseuse_schedule'',''start''"> 13:00-17:00 shift</a>'
 	elseif masseuse['7_shift_2_taken'] = 2:
 		'13:00-17:00 shift'
 		'<i>not available</i>'
 	else
 		'13:00-17:00 shift'
-		'<a href="exec:masseuse[''7_shift_check''] = 0 & masseuse[''7_shift_2''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
+		'<a href="exec:masseuse[''7_shift_2''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
 	end
 	'</td><td>'
 
 !! Second Monday Shift
 
 	if masseuse['1_shift_2'] = 0 and masseuse['1_shift_2_taken'] < 2:
-		'<a href="exec:masseuse[''1_shift_check''] = 1 & masseuse[''1_shift_2''] = 1 & gt''masseuse_schedule'',''start''"> 13:00-17:00 shift</a>'
+		'<a href="exec:masseuse[''1_shift_2''] = 1 & gt''masseuse_schedule'',''start''"> 13:00-17:00 shift</a>'
 	elseif masseuse['1_shift_2_taken'] = 2:
 		'13:00-17:00 shift'
 		'<i>not available</i>'
 	else
 		'13:00-17:00 shift'
-		'<a href="exec:masseuse[''1_shift_check''] = 0 & masseuse[''1_shift_2''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
+		'<a href="exec:masseuse[''1_shift_2''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
 	end
 	'</td><td>'
 
 !! Second Tuesday Shift
 
 	if masseuse['2_shift_2'] = 0 and masseuse['2_shift_2_taken'] < 2:
-		'<a href="exec:masseuse[''2_shift_check''] = 2 & masseuse[''2_shift_2''] = 1 & gt''masseuse_schedule'',''start''"> 13:00-17:00 shift</a>'
+		'<a href="exec:masseuse[''2_shift_2''] = 1 & gt''masseuse_schedule'',''start''"> 13:00-17:00 shift</a>'
 	elseif masseuse['2_shift_2_taken'] = 2:
 		'13:00-17:00 shift'
 		'<i>not available</i>'
 	else
 		'13:00-17:00 shift'
-		'<a href="exec:masseuse[''2_shift_check''] = 0 & masseuse[''2_shift_2''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
+		'<a href="exec:masseuse[''2_shift_2''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
 	end
 	'</td><td>'
 
 !! Second Wednesday Shift
 
 	if masseuse['3_shift_2'] = 0 and masseuse['3_shift_2_taken'] < 2:
-		'<a href="exec:masseuse[''3_shift_check''] = 3 & masseuse[''3_shift_2''] = 1 & gt''masseuse_schedule'',''start''"> 13:00-17:00 shift</a>'
+		'<a href="exec:masseuse[''3_shift_2''] = 1 & gt''masseuse_schedule'',''start''"> 13:00-17:00 shift</a>'
 	elseif masseuse['3_shift_2_taken'] = 2:
 		'13:00-17:00 shift'
 		'<i>not available</i>'
 	else
 		'13:00-17:00 shift'
-		'<a href="exec:masseuse[''3_shift_check''] = 0 & masseuse[''3_shift_2''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
+		'<a href="exec:masseuse[''3_shift_2''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
 	end
 	'</td><td>'
 
 !! Second Thursday Shift
 
 	if masseuse['4_shift_2'] = 0 and masseuse['4_shift_2_taken'] < 2:
-		'<a href="exec:masseuse[''4_shift_check''] = 4 & masseuse[''4_shift_2''] = 1 & gt''masseuse_schedule'',''start''"> 13:00-17:00 shift</a>'
+		'<a href="exec:masseuse[''4_shift_2''] = 1 & gt''masseuse_schedule'',''start''"> 13:00-17:00 shift</a>'
 	elseif masseuse['4_shift_2_taken'] = 2:
 		'13:00-17:00 shift'
 		'<i>not available</i>'
 	else
 		'13:00-17:00 shift'
-		'<a href="exec:masseuse[''4_shift_check''] = 0 & masseuse[''4_shift_2''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
+		'<a href="exec:masseuse[''4_shift_2''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
 	end
 	'</td><td>'
 
 !! Second Friday Shift
 	
 	if masseuse['5_shift_2'] = 0 and masseuse['5_shift_2_taken'] < 2:
-		'<a href="exec:masseuse[''5_shift_check''] = 5 & masseuse[''5_shift_2''] = 1 & gt''masseuse_schedule'',''start''"> 13:00-17:00 shift</a>'
+		'<a href="exec:masseuse[''5_shift_2''] = 1 & gt''masseuse_schedule'',''start''"> 13:00-17:00 shift</a>'
 	elseif masseuse['5_shift_2_taken'] = 2:
 		'13:00-17:00 shift'
 		'<i>not available</i>'
 	else
 		'13:00-17:00 shift'
-		'<a href="exec:masseuse[''5_shift_check''] = 0 & masseuse[''5_shift_2''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
+		'<a href="exec:masseuse[''5_shift_2''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
 	end
 	'</td><td>'
 
 !! Second Saturday Shift
 
 	if masseuse['6_shift_2'] = 0 and masseuse['6_shift_2_taken'] < 2:
-		'<a href="exec:masseuse[''6_shift_check''] = 6 & masseuse[''6_shift_2''] = 1 & gt''masseuse_schedule'',''start''"> 13:00-17:00 shift</a>'
+		'<a href="exec:masseuse[''6_shift_2''] = 1 & gt''masseuse_schedule'',''start''"> 13:00-17:00 shift</a>'
 	elseif masseuse['6_shift_2_taken'] = 2:
 		'13:00-17:00 shift'
 		'<i>not available</i>'
 	else
 		'09:00-13:00 shift'
-		'<a href="exec:masseuse[''6_shift_check''] = 0 & masseuse[''6_shift_2''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
+		'<a href="exec:masseuse[''6_shift_2''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
 	end
 	'</td></tr>'
 	
@@ -267,91 +267,91 @@ act'Finish scheduling':gt'salon','start'
 !! Third Sunday Shift
 	*P '<tr><td>' 
 	if masseuse['7_shift_3'] = 0 and masseuse['7_shift_3_taken'] < 2:
-		'<a href="exec:masseuse[''7_shift_check''] = 7 & masseuse[''7_shift_3''] = 1 & gt''masseuse_schedule'',''start''"> 17:00-21:00 shift</a>'
+		'<a href="exec:masseuse[''7_shift_3''] = 1 & gt''masseuse_schedule'',''start''"> 17:00-21:00 shift</a>'
 	elseif masseuse['7_shift_3_taken'] = 2:
 		'17:00-21:00 shift'
 		'<i>not available</i>'
 	else
 		'17:00-21:00 shift'
-		'<a href="exec:masseuse[''7_shift_check''] = 0 & masseuse[''7_shift_3''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
+		'<a href="exec:masseuse[''7_shift_3''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
 	end
 	'</td><td>'
 
 !! Third Monday Shift
 
 	if masseuse['1_shift_3'] = 0 and masseuse['1_shift_3_taken'] < 2:
-		'<a href="exec:masseuse[''1_shift_check''] = 1 & masseuse[''1_shift_3''] = 1 & gt''masseuse_schedule'',''start''"> 17:00-21:00 shift</a>'
+		'<a href="exec:masseuse[''1_shift_3''] = 1 & gt''masseuse_schedule'',''start''"> 17:00-21:00 shift</a>'
 	elseif masseuse['1_shift_3_taken'] = 2:
 		'17:00-21:00 shift'
 		'<i>not available</i>'
 	else
 		'17:00-21:00 shift'
-		'<a href="exec:masseuse[''1_shift_check''] = 0 & masseuse[''1_shift_3''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
+		'<a href="exec:masseuse[''1_shift_3''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
 	end
 	'</td><td>'
 
 !! Third Tuesday Shift
 
 	if masseuse['2_shift_3'] = 0 and masseuse['2_shift_3_taken'] < 2:
-		'<a href="exec:masseuse[''2_shift_check''] = 2 & masseuse[''2_shift_3''] = 1 & gt''masseuse_schedule'',''start''"> 17:00-21:00 shift</a>'
+		'<a href="exec:masseuse[''2_shift_3''] = 1 & gt''masseuse_schedule'',''start''"> 17:00-21:00 shift</a>'
 	elseif masseuse['2_shift_3_taken'] = 2:
 		'17:00-21:00 shift'
 		'<i>not available</i>'
 	else
 		'17:00-21:00 shift'
-		'<a href="exec:masseuse[''2_shift_check''] = 0 & masseuse[''2_shift_3''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
+		'<a href="exec:masseuse[''2_shift_3''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
 	end
 	'</td><td>'
 
 !! Third Wednesday Shift
 
 	if masseuse['3_shift_3'] = 0 and masseuse['3_shift_3_taken'] < 2:
-		'<a href="exec:masseuse[''3_shift_check''] = 3 & masseuse[''3_shift_3''] = 1 & gt''masseuse_schedule'',''start''"> 17:00-21:00 shift</a>'
+		'<a href="exec:masseuse[''3_shift_3''] = 1 & gt''masseuse_schedule'',''start''"> 17:00-21:00 shift</a>'
 	elseif masseuse['3_shift_3_taken'] = 2:
 		'17:00-21:00 shift'
 		'<i>not available</i>'
 	else
 		'17:00-21:00 shift'
-		'<a href="exec:masseuse[''3_shift_check''] = 0 & masseuse[''3_shift_3''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
+		'<a href="exec:masseuse[''3_shift_3''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
 	end
 	'</td><td>'
 
 !! Third Thursday Shift
 
 	if masseuse['4_shift_3'] = 0 and masseuse['4_shift_3_taken'] < 2:
-		'<a href="exec:masseuse[''4_shift_check''] = 4 & masseuse[''4_shift_3''] = 1 & gt''masseuse_schedule'',''start''"> 17:00-21:00 shift</a>'
+		'<a href="exec:masseuse[''4_shift_3''] = 1 & gt''masseuse_schedule'',''start''"> 17:00-21:00 shift</a>'
 	elseif masseuse['4_shift_3_taken'] = 2:
 		'17:00-21:00 shift'
 		'<i>not available</i>'
 	else
 		'17:00-21:00 shift'
-		'<a href="exec:masseuse[''4_shift_check''] = 0 & masseuse[''4_shift_3''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
+		'<a href="exec:masseuse[''4_shift_3''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
 	end
 	'</td><td>'
 
 !! Third Friday Shift
 	
 	if masseuse['5_shift_3'] = 0 and masseuse['5_shift_3_taken'] < 2:
-		'<a href="exec:masseuse[''5_shift_check''] = 5 & masseuse[''5_shift_3''] = 1 & gt''masseuse_schedule'',''start''"> 17:00-21:00 shift</a>'
+		'<a href="exec:masseuse[''5_shift_3''] = 1 & gt''masseuse_schedule'',''start''"> 17:00-21:00 shift</a>'
 	elseif masseuse['5_shift_3_taken'] = 2:
 		'17:00-21:00 shift'
 		'<i>not available</i>'
 	else
 		'17:00-21:00 shift'
-		'<a href="exec:masseuse[''5_shift_check''] = 0 & masseuse[''5_shift_3''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
+		'<a href="exec:masseuse[''5_shift_3''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
 	end
 	'</td><td>'
 
 !! Third Saturday Shift
 
 	if masseuse['6_shift_3'] = 0 and masseuse['6_shift_3_taken'] < 2:
-		'<a href="exec:masseuse[''6_shift_check''] = 6 & masseuse[''6_shift_3''] = 1 & gt''masseuse_schedule'',''start''"> 17:00-21:00 shift</a>'
+		'<a href="exec:masseuse[''6_shift_3''] = 1 & gt''masseuse_schedule'',''start''"> 17:00-21:00 shift</a>'
 	elseif masseuse['6_shift_3_taken'] = 2:
 		'17:00-21:00 shift'
 		'<i>not available</i>'
 	else
 		'17:00-21:00 shift'
-		'<a href="exec:masseuse[''6_shift_check''] = 0 & masseuse[''6_shift_3''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
+		'<a href="exec:masseuse[''6_shift_3''] = 0 & gt''masseuse_schedule'',''start''"> Cancel Shift</a>'
 	end
 	'</td></tr>'