Add straw

xml/page_board.xml

@@ -205,9 +205,13 @@
 
 		If SystemDateMonth = 11 Then
 			If SystemDateDay > 1 Then
+				If SystemDateDay < 10 Then
 					Var EventTurnOn = 2
 				EndIf
 			EndIf
+		EndIf
+
+
 
 
 

xml/page_brewing3.xml

@@ -55,6 +55,9 @@
 		Var bnGetMoreStrawFileName = "ROOT/taobin_project/image/page_doing/bn_get_more_straw_en.png"
 		Var bpGetMoreStrawFileName = "ROOT/taobin_project/image/page_doing/bp_get_more_straw_en.png"
 
+		Var bnStrawProblemReport = "ROOT/taobin_project/image/page_doing/bn_send_report_straw_en.png"
+		Var bpStrawProblemReport = "ROOT/taobin_project/image/page_doing/bp_send_report_straw_en.png"
+
 		Var XStraw = 336
 	Else
 		;Var DirImage = "ROOT/taobin_project/image/collect_point1"
@@ -66,6 +69,9 @@
 		Var bnGetMoreStrawFileName = "ROOT/taobin_project/image/page_doing/bn_get_more_straw.png"
 		Var bpGetMoreStrawFileName = "ROOT/taobin_project/image/page_doing/bp_get_more_straw.png"
 
+		Var bnStrawProblemReport = "ROOT/taobin_project/image/page_doing/bn_send_report_straw.png"
+		Var bpStrawProblemReport = "ROOT/taobin_project/image/page_doing/bp_send_report_straw.png"
+
 		Var XStraw = 382
 	EndIf
 
@@ -256,6 +262,7 @@
 	; Hide
 	Var bg_strawlid_ST = "Invisible"
 	Var bg_strawProblem_ST = "Invisible"
+	Var StrawProblemStatus = 1
 	Var StrawStateX = "Invisible"
 	Var LidStateX = "Invisible"
 
@@ -1107,6 +1114,14 @@
 		EndIf
 	EndIf
 		
+	If GetMoreStrawCount <= 0 Then
+
+		If StrawProblemStatus = 1 Then
+			Var StrawProblemStatus = 2
+			Var bg_strawProblem_ST = "Enable"
+		EndIf
+
+	EndIf
 
 	Refresh
 	TimerReset
@@ -1336,6 +1351,23 @@
 </EventClick> 
 </Button>
 
+<Button>
+<X> XStraw </X>
+<Y> 1787 </Y>
+<State>bg_strawProblem_ST</State>
+<Filename>  bnStrawProblemReport </Filename>
+<FilenamePress> bpStrawProblemReport </FilenamePress>
+<EventClick> 
+
+	Var strawStr = "แจ้งปัญหาไม่ได้รับหลอด"
+	
+	__CMD "straw-alert" 0 strawStr "-"
+ 	__CMD "send-error-code" 1231 "-" "-"
+	Var bg_strawProblem_ST = "Invisible"
+
+	Refresh
+</EventClick> 
+</Button>
 
 
 <Button>

xml/page_drinkok.xml

@@ -172,10 +172,12 @@
 	Var DelayButton = 0
 
 
-		
-	If GetMoreStrawCount = 0 Then
+	DEBUGVAR GetMoreStrawCount
+	If GetMoreStrawCount <= 0 Then
+		If StrawProblemStatus = 1 Then
 			Var bg_strawProblem_ST = "Enable"
 		EndIf
+	EndIf