修改显示错误的bug

Harrison0984 · Jul 21, 2015 · 0162cc9 · 0162cc9
1 parent 66b7471
commit 0162cc9
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 29 deletions.
diff --git a/app/controllers/combinationgame_controller.rb b/app/controllers/combinationgame_controller.rb
@@ -9,9 +9,9 @@ def index
 			@minutes = (@seconds / 60).to_i
 			@seconds = (@seconds % 60).to_i
 
-			@currentbar = tasklog.currentbar
-			tsktime = Time.parse(tasklog.runtime.to_s)
-			@issue = tsktime.strftime("%Y%m%d")+(tasklog.currentbar).to_s
+			@totalbar = 90
+			@currentbar = @totalbar - (tasklog.totalbar - tasklog.currentbar)
+			@issue = (tasklog.nextgameid.to_i-1).to_s
 
 			@grid = Grid.find_by_gameid(@issue)
 		end

diff --git a/app/controllers/doublegame_controller.rb b/app/controllers/doublegame_controller.rb
@@ -9,10 +9,10 @@ def index
 			@minutes = (@seconds / 60).to_i
 			@seconds = (@seconds % 60).to_i
 
-			@currentbar = tasklog.currentbar
-			tsktime = Time.parse(tasklog.runtime.to_s)
-			@issue = tsktime.strftime("%Y%m%d")+(tasklog.currentbar).to_s
-
+			@totalbar = 90
+			@currentbar = @totalbar - (tasklog.totalbar - tasklog.currentbar)
+			@issue = (tasklog.nextgameid.to_i-1).to_s
+			
 			@grid = Grid.find_by_gameid(@issue)
 		end
 

diff --git a/app/controllers/flashview_controller.rb b/app/controllers/flashview_controller.rb
@@ -9,14 +9,14 @@ def index
 			@minutes = (@seconds / 60).to_i
 			@seconds = (@seconds % 60).to_i
 
-			@currentbar = tasklog.currentbar
-			tsktime = Time.parse(tasklog.runtime.to_s)
-			@issue = tsktime.strftime("%Y%m%d")+(tasklog.currentbar).to_s
+			@totalbar = 90
+			@currentbar = @totalbar - (tasklog.totalbar - tasklog.currentbar)
+			@issue = (tasklog.nextgameid.to_i-1).to_s
 
 			@grid = Grid.find_by_gameid(@issue)
 		end
 
-		if @minutes < 0
+		if @minutes and @minutes < 0
 			@minutes = 9
 		end
 

diff --git a/app/controllers/main_controller.rb b/app/controllers/main_controller.rb
@@ -10,9 +10,9 @@ def index
 			@minutes = (@seconds / 60).to_i
 			@seconds = (@seconds % 60).to_i
 
-			@currentbar = tasklog.currentbar
-			tsktime = Time.parse(tasklog.runtime.to_s)
-			@issue = tsktime.strftime("%Y%m%d")+(tasklog.currentbar).to_s
+			@totalbar = 90
+			@currentbar = @totalbar - (tasklog.totalbar - tasklog.currentbar)
+			@issue = (tasklog.nextgameid.to_i-1).to_s
 
 			@grid = Grid.find_by_gameid(@issue)
 		end

diff --git a/app/controllers/mainhistory_controller.rb b/app/controllers/mainhistory_controller.rb
@@ -9,14 +9,14 @@ def index
 			@minutes = (@seconds / 60).to_i
 			@seconds = (@seconds % 60).to_i
 
-			@currentbar = tasklog.currentbar
-			tsktime = Time.parse(tasklog.runtime.to_s)
-			@issue = tsktime.strftime("%Y%m%d")+(tasklog.currentbar).to_s
+			@totalbar = 90
+			@currentbar = @totalbar - (tasklog.totalbar - tasklog.currentbar)
+			@issue = (tasklog.nextgameid.to_i-1).to_s
 
 			@grid = Grid.find_by_gameid(@issue)
 		end
 
-		if @minutes < 0
+		if @minutes and @minutes < 0
 			@minutes = 9
 		end
 

diff --git a/app/controllers/singlegame_controller.rb b/app/controllers/singlegame_controller.rb
@@ -9,9 +9,9 @@ def index
 			@minutes = (@seconds / 60).to_i
 			@seconds = (@seconds % 60).to_i
 
-			@currentbar = tasklog.currentbar
-			tsktime = Time.parse(tasklog.runtime.to_s)
-			@issue = tsktime.strftime("%Y%m%d")+(tasklog.currentbar).to_s
+			@totalbar = 90
+			@currentbar = @totalbar - (tasklog.totalbar - tasklog.currentbar)
+			@issue = (tasklog.nextgameid.to_i-1).to_s
 
 			@grid = Grid.find_by_gameid(@issue)
 		end

diff --git a/app/controllers/traceresult_controller.rb b/app/controllers/traceresult_controller.rb
@@ -4,20 +4,20 @@ class TraceresultController < ApplicationController
 	def index
 		curtime = Time.new
 		tasklog = Tasklog.find_by_taskdate(curtime.strftime("%Y-%m-%d"))
-		if tasklog and session[:userid] != 0
+		if tasklog
 			@seconds = tasklog.nexttime - curtime - 8 * 3600
 			@minutes = (@seconds / 60).to_i
 			@seconds = (@seconds % 60).to_i
 
-			@currentbar = tasklog.currentbar
-			tsktime = Time.parse(tasklog.runtime.to_s)
-			@issue = tsktime.strftime("%Y%m%d")+(tasklog.currentbar).to_s
+			@totalbar = 90
+			@currentbar = @totalbar - (tasklog.totalbar - tasklog.currentbar)
+			@issue = (tasklog.nextgameid.to_i-1).to_s
 
 			@grid = Grid.find_by_gameid(@issue)
 			@gridlogs = Tracelog.where("time > ? and userid = ?", (curtime - 60*60).strftime("%Y-%m-%d %H:%M"), session[:userid])
 		end
 
-		if @minutes < 0
+		if @minutes and @minutes < 0
 			@minutes = 9
 		end
 

diff --git a/app/views/layouts/main.html.erb b/app/views/layouts/main.html.erb
@@ -179,7 +179,7 @@
         </div>
         <div class="period" style="color: green;"><%= @issue %>期
         </div>
-        <div class="period-info" >每日销售<span>90</span>期，今日剩余<span class="period-leave"><%= 90-@currentbar.to_i %></span>期</div>
+        <div class="period-info" >每日销售<span><%= @totalbar %></span>期，今日剩余<span class="period-leave"><%= 90-@currentbar.to_i %></span>期</div>
         <div class="lot-nums">
             <% if @grid %>
             <span class=<%= "no#{(@grid.x1+1).to_s.rjust(2, '0')}" %>></span>

diff --git a/config/initializers/task.rb b/config/initializers/task.rb
@@ -299,7 +299,7 @@ def checkGrid (object)
 			tasklog = Tasklog.find_by_taskdate(curtime.strftime("%Y-%m-%d"))
 			if tasklog == nil
 				tasklog = Tasklog.new
-				tasklog.totalbar = 228
+				tasklog.totalbar = left_count
 				tasklog.currentbar = objindex+1
 				tasklog.errorbar = 0
 				tasklog.totalcoin = totalcoin
@@ -310,7 +310,7 @@ def checkGrid (object)
 				tasklog.nextgameid = curtime.strftime("%Y%m%d")+(begin_count+objindex+2).to_s
 				tasklog.save
 			else
-				tasklog.update(currentbar: objindex+1, totalcoin: totalcoin, 
+				tasklog.update(totalbar: left_count, currentbar: objindex+1, totalcoin: totalcoin, 
 					prizecoin: prizecoin, runtime: curtime.strftime("%Y-%m-%d %H:%M"),
 					nextgameid: curtime.strftime("%Y%m%d")+(begin_count+objindex+2).to_s,
 					nexttime: nexttime.strftime("%Y-%m-%d %H:%M"))