From fe8111e4f3c56bf56ee620506cac2453818c4e0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E9=82=88?= <shankerwangmiao@gmail.com>
Date: Mon, 2 Mar 2020 21:32:01 +0800
Subject: [PATCH] bug fix: rolling

---
 static/js/status.es6 |  2 +-
 status.html          | 38 ++++++++++++++++++++++++++------------
 2 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/static/js/status.es6 b/static/js/status.es6
index d39fb17..c8cc138 100644
--- a/static/js/status.es6
+++ b/static/js/status.es6
@@ -38,7 +38,7 @@ $(document).ready(() => {
 		var $objs = $('tr:not(:hover):not(:active) > td[class*="rolling-"] > div');
 		$objs.each(function(){
 			var $this = $(this);
-			var index = $this.children('div[data-tuna-roll-seq="'+step+'"]').index();
+			var index = $this.children('div[data-tuna-roll-seq~="'+step+'"]').index();
 			if(index == -1){
 				return;
 			}
diff --git a/status.html b/status.html
index f96075e..967dd7d 100644
--- a/status.html
+++ b/status.html
@@ -60,25 +60,39 @@ permalink: /status/
 						<td class="hidden-xs hidden-sm hidden-md hidden-lg"></td>
 						<td class="col-md-2 col-xs-3 rolling-3 text-left-md text-right-xs hidden-xs hidden-sm">​
 							<div>
-								<div data-tuna-roll-seq=0>Last Successful Sync</div>
-								<template v-if="mir.last_ended_ts != mir.last_update_ts">
-								<div data-tuna-roll-seq=1>Last Attempted Sync</div>
-								<div data-tuna-roll-seq=2>Last Successful Sync</div>
-								<div data-tuna-roll-seq=3>Last Attempted Sync</div>
+								<template v-if="mir.last_ended_ts == mir.last_update_ts">
+									<div data-tuna-roll-seq="0 1 2 3">Last Successful Sync</div>
 								</template>
-								<div data-tuna-roll-seq=4>Next Scheduled Sync</div>
+								<template v-else>
+								<div data-tuna-roll-seq="0">Last Successful Sync</div>
+								<div data-tuna-roll-seq="1">Last Attempted Sync</div>
+								<div data-tuna-roll-seq="2">Last Successful Sync</div>
+								<div data-tuna-roll-seq="3">Last Attempted Sync</div>
+								</template>
+								<div data-tuna-roll-seq="4 5">Next Scheduled Sync</div>
 								<div data-tuna-roll-seq=6>Last Successful Sync</div>
 							</div>
 						</td>
 						<td class="hidden-xs hidden-sm hidden-md hidden-lg"></td>
 						<td class="col-md-2 col-xs-5 rolling-6 hidden-xs hidden-sm">​
 							<div>
-								<div data-tuna-roll-seq=0>{{mir.last_update}}</div>
-								<div data-tuna-roll-seq=1 v-if="mir.last_ended_ts != mir.last_update_ts">{{mir.last_ended}}</div>
-								<div data-tuna-roll-seq=2>{{mir.last_update_ago}}</div>
-								<div data-tuna-roll-seq=3 v-if="mir.last_ended_ts != mir.last_update_ts">{{mir.last_ended_ago}}</div>
-								<div data-tuna-roll-seq=4>{{mir.status != 'syncing' ? mir.next_schedule : 'Syncing Now'}}</div>
-								<div data-tuna-roll-seq=5 v-if="mir.status != 'syncing'">{{mir.next_schedule_ago}}</div>
+								<template v-if="mir.last_ended_ts == mir.last_update_ts">
+									<div data-tuna-roll-seq="0 1">{{mir.last_update}}</div>
+									<div data-tuna-roll-seq="2 3">{{mir.last_update_ago}}</div>
+								</template>
+								<template v-else>
+								<div data-tuna-roll-seq="0">{{mir.last_update}}</div>
+								<div data-tuna-roll-seq="1" v-if="mir.last_ended_ts != mir.last_update_ts">{{mir.last_ended}}</div>
+								<div data-tuna-roll-seq="2">{{mir.last_update_ago}}</div>
+								<div data-tuna-roll-seq="3" v-if="mir.last_ended_ts != mir.last_update_ts">{{mir.last_ended_ago}}</div>
+								</template>
+								<template v-if="mir.status == 'syncing'">
+									<div data-tuna-roll-seq="4 5">Syncing Now</div>
+								</template>
+								<template v-else>
+									<div data-tuna-roll-seq="4">{{mir.next_schedule}}</div>
+									<div data-tuna-roll-seq="5">{{mir.next_schedule_ago}}</div>
+								</template>
 								<div data-tuna-roll-seq=6>{{mir.last_update}}</div>
 							</div>
 						</td>