From: Marius Gavrilescu <marius@ieval.ro>
Date: Sun, 8 Feb 2015 10:37:01 +0000 (+0200)
Subject: Add timers for contest start/stop and problem value
X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=20777d844ac7adb5887ea4e50885cd9702b7ee6a;p=plack-app-gruntmaster.git

Add timers for contest start/stop and problem value
---

diff --git a/css/custom.css b/css/custom.css
index 4239ab8..f784c4e 100644
--- a/css/custom.css
+++ b/css/custom.css
@@ -86,4 +86,9 @@ ul.inline li:last-child:after {
 
 .tracker-mark.x{
 	color: red;
+}
+
+#ctcountdown {
+	text-align: center;
+	font-size: 200%;
 }
\ No newline at end of file
diff --git a/js/20-sprintf.js b/js/20-sprintf.js
new file mode 100644
index 0000000..0ccb64c
--- /dev/null
+++ b/js/20-sprintf.js
@@ -0,0 +1,195 @@
+(function(window) {
+    var re = {
+        not_string: /[^s]/,
+        number: /[dief]/,
+        text: /^[^\x25]+/,
+        modulo: /^\x25{2}/,
+        placeholder: /^\x25(?:([1-9]\d*)\$|\(([^\)]+)\))?(\+)?(0|'[^$])?(-)?(\d+)?(?:\.(\d+))?([b-fiosuxX])/,
+        key: /^([a-z_][a-z_\d]*)/i,
+        key_access: /^\.([a-z_][a-z_\d]*)/i,
+        index_access: /^\[(\d+)\]/,
+        sign: /^[\+\-]/
+    }
+
+    function sprintf() {
+        var key = arguments[0], cache = sprintf.cache
+        if (!(cache[key] && cache.hasOwnProperty(key))) {
+            cache[key] = sprintf.parse(key)
+        }
+        return sprintf.format.call(null, cache[key], arguments)
+    }
+
+    sprintf.format = function(parse_tree, argv) {
+        var cursor = 1, tree_length = parse_tree.length, node_type = "", arg, output = [], i, k, match, pad, pad_character, pad_length, is_positive = true, sign = ""
+        for (i = 0; i < tree_length; i++) {
+            node_type = get_type(parse_tree[i])
+            if (node_type === "string") {
+                output[output.length] = parse_tree[i]
+            }
+            else if (node_type === "array") {
+                match = parse_tree[i] // convenience purposes only
+                if (match[2]) { // keyword argument
+                    arg = argv[cursor]
+                    for (k = 0; k < match[2].length; k++) {
+                        if (!arg.hasOwnProperty(match[2][k])) {
+                            throw new Error(sprintf("[sprintf] property '%s' does not exist", match[2][k]))
+                        }
+                        arg = arg[match[2][k]]
+                    }
+                }
+                else if (match[1]) { // positional argument (explicit)
+                    arg = argv[match[1]]
+                }
+                else { // positional argument (implicit)
+                    arg = argv[cursor++]
+                }
+
+                if (get_type(arg) == "function") {
+                    arg = arg()
+                }
+
+                if (re.not_string.test(match[8]) && (get_type(arg) != "number" && isNaN(arg))) {
+                    throw new TypeError(sprintf("[sprintf] expecting number but found %s", get_type(arg)))
+                }
+
+                if (re.number.test(match[8])) {
+                    is_positive = arg >= 0
+                }
+
+                switch (match[8]) {
+                    case "b":
+                        arg = arg.toString(2)
+                    break
+                    case "c":
+                        arg = String.fromCharCode(arg)
+                    break
+                    case "d":
+                    case "i":
+                        arg = parseInt(arg, 10)
+                    break
+                    case "e":
+                        arg = match[7] ? arg.toExponential(match[7]) : arg.toExponential()
+                    break
+                    case "f":
+                        arg = match[7] ? parseFloat(arg).toFixed(match[7]) : parseFloat(arg)
+                    break
+                    case "o":
+                        arg = arg.toString(8)
+                    break
+                    case "s":
+                        arg = ((arg = String(arg)) && match[7] ? arg.substring(0, match[7]) : arg)
+                    break
+                    case "u":
+                        arg = arg >>> 0
+                    break
+                    case "x":
+                        arg = arg.toString(16)
+                    break
+                    case "X":
+                        arg = arg.toString(16).toUpperCase()
+                    break
+                }
+                if (re.number.test(match[8]) && (!is_positive || match[3])) {
+                    sign = is_positive ? "+" : "-"
+                    arg = arg.toString().replace(re.sign, "")
+                }
+                else {
+                    sign = ""
+                }
+                pad_character = match[4] ? match[4] === "0" ? "0" : match[4].charAt(1) : " "
+                pad_length = match[6] - (sign + arg).length
+                pad = match[6] ? (pad_length > 0 ? str_repeat(pad_character, pad_length) : "") : ""
+                output[output.length] = match[5] ? sign + arg + pad : (pad_character === "0" ? sign + pad + arg : pad + sign + arg)
+            }
+        }
+        return output.join("")
+    }
+
+    sprintf.cache = {}
+
+    sprintf.parse = function(fmt) {
+        var _fmt = fmt, match = [], parse_tree = [], arg_names = 0
+        while (_fmt) {
+            if ((match = re.text.exec(_fmt)) !== null) {
+                parse_tree[parse_tree.length] = match[0]
+            }
+            else if ((match = re.modulo.exec(_fmt)) !== null) {
+                parse_tree[parse_tree.length] = "%"
+            }
+            else if ((match = re.placeholder.exec(_fmt)) !== null) {
+                if (match[2]) {
+                    arg_names |= 1
+                    var field_list = [], replacement_field = match[2], field_match = []
+                    if ((field_match = re.key.exec(replacement_field)) !== null) {
+                        field_list[field_list.length] = field_match[1]
+                        while ((replacement_field = replacement_field.substring(field_match[0].length)) !== "") {
+                            if ((field_match = re.key_access.exec(replacement_field)) !== null) {
+                                field_list[field_list.length] = field_match[1]
+                            }
+                            else if ((field_match = re.index_access.exec(replacement_field)) !== null) {
+                                field_list[field_list.length] = field_match[1]
+                            }
+                            else {
+                                throw new SyntaxError("[sprintf] failed to parse named argument key")
+                            }
+                        }
+                    }
+                    else {
+                        throw new SyntaxError("[sprintf] failed to parse named argument key")
+                    }
+                    match[2] = field_list
+                }
+                else {
+                    arg_names |= 2
+                }
+                if (arg_names === 3) {
+                    throw new Error("[sprintf] mixing positional and named placeholders is not (yet) supported")
+                }
+                parse_tree[parse_tree.length] = match
+            }
+            else {
+                throw new SyntaxError("[sprintf] unexpected placeholder")
+            }
+            _fmt = _fmt.substring(match[0].length)
+        }
+        return parse_tree
+    }
+
+    var vsprintf = function(fmt, argv, _argv) {
+        _argv = (argv || []).slice(0)
+        _argv.splice(0, 0, fmt)
+        return sprintf.apply(null, _argv)
+    }
+
+    /**
+     * helpers
+     */
+    function get_type(variable) {
+        return Object.prototype.toString.call(variable).slice(8, -1).toLowerCase()
+    }
+
+    function str_repeat(input, multiplier) {
+        return Array(multiplier + 1).join(input)
+    }
+
+    /**
+     * export to either browser or node.js
+     */
+    if (typeof exports !== "undefined") {
+        exports.sprintf = sprintf
+        exports.vsprintf = vsprintf
+    }
+    else {
+        window.sprintf = sprintf
+        window.vsprintf = vsprintf
+
+        if (typeof define === "function" && define.amd) {
+            define(function() {
+                return {
+                    sprintf: sprintf,
+                    vsprintf: vsprintf
+                }
+            })
+        }
+    }
+})(typeof window === "undefined" ? this : window);
diff --git a/js/90-timers.js b/js/90-timers.js
new file mode 100644
index 0000000..2d6cbfb
--- /dev/null
+++ b/js/90-timers.js
@@ -0,0 +1,32 @@
+(function(){
+	'use strict';
+
+	function update_timer(timer){
+		var start = parseInt(timer.dataset.start);
+		var stop  = parseInt(timer.dataset.stop);
+		var value = parseInt(timer.dataset.value);
+		var now   = Math.floor(Date.now() / 1000);
+
+		var left = stop - now;
+		var total = stop - start;
+		if(left < 0)
+			left = 0;
+
+		if(value) {
+			value = Math.max(value * 3 / 10, value * left / total);
+			timer.innerHTML = Math.floor(value);
+		} else {
+			var hours = left / 60 / 60;
+			var minutes = left / 60 % 60;
+			var seconds = left % 60;
+			timer.innerHTML = sprintf('%02d:%02d:%02d', hours, minutes, seconds);
+		}
+	}
+
+	$( document ).ready(function() {
+		$('.timer').each(function(index, item){
+			update_timer(item);
+			setInterval(function(){update_timer(item)}, 1000);
+		});
+	});
+})();
diff --git a/lib/Plack/App/Gruntmaster/HTML.pm b/lib/Plack/App/Gruntmaster/HTML.pm
index 52afd11..fe7e496 100644
--- a/lib/Plack/App/Gruntmaster/HTML.pm
+++ b/lib/Plack/App/Gruntmaster/HTML.pm
@@ -115,9 +115,12 @@ sub process_ct_entry {
 	my ($tree, %args) = @_;
 	$_->edit_href (sub {s/contest_id/$args{id}/}) for $tree->find('a');
 	$tree->fid('links')->detach unless $args{started};
+	my $status = ($args{time} < $args{start} ? 'starts' : 'ends');
+	$tree->fclass('timer')->attr('data-stop', $status eq 'ends' ? $args{stop} : $args{start});
 	$tree->content_handler(
 		start       => ftime   $args{start},
 		stop        => ftime   $args{stop},
+		status      => $status,
 		description => literal $args{description});
 }
 
@@ -147,14 +150,11 @@ sub process_pb_entry {
 	if ($args{contest_stop}) {
 		$tree->fid('solution')->detach;
 		$tree->fid('solution_modal')->detach;
-		my $countdown = $tree->fid('countdown');
-		$countdown->attr('data-start' => $args{open_time});
-		$countdown->attr('data-stop' => $args{contest_stop});
-		$countdown->attr('data-time' => $args{time});
-		my $left = $args{contest_stop} - $args{time};
-		$countdown->replace_content(sprintf '%02d:%02d:%02d', $left/60/60, $left/60%60, $left%60);
-		$tree->fid('score')->attr('data-value' => $args{value});
-		$tree->fid('score')->replace_content(Gruntmaster::Data::Result::Contest::calc_score($args{value}, $args{time} - $args{open_time}, 0, $args{contest_stop} - $args{contest_start}));
+		my $score = $tree->fid('score');
+		$score->attr('data-start' => $args{open_time});
+		$score->attr('data-stop'  => $args{contest_stop});
+		$score->attr('data-value'  => $args{value});
+		$tree->fid('countdown')->attr('data-stop' => $args{contest_stop});
 	} else {
 		$tree->fid('solution')->detach unless $args{solution};
 		$_->detach for $tree->fclass('rc'); # requires contest
diff --git a/tmpl/ct_entry.en b/tmpl/ct_entry.en
index 5a44866..c30a503 100644
--- a/tmpl/ct_entry.en
+++ b/tmpl/ct_entry.en
@@ -3,6 +3,9 @@
 <dt>Contest stop time</dt>  <dd id="stop">stop</dd>
 </dl>
 
+<div id="ctcountdown">
+Contest <span id="status">starts/ends</span> in: <span class="timer" data-stop="...">
+</div>
 <div id="description">description</div>
 
 <div id="links">
diff --git a/tmpl/pb_entry.en b/tmpl/pb_entry.en
index 215d918..0d7c2a1 100644
--- a/tmpl/pb_entry.en
+++ b/tmpl/pb_entry.en
@@ -9,8 +9,8 @@
 <dt>Owner</dt> <dd id="owner">owner</dd>
 <dt>Level</dt> <dd id="level">Easy</dd>
 <dt>Time limit (seconds)</dt> <dd smap="timeout">1</dd>
-<dt class="rc">Score</dt> <dd id="score" data-value="100" class="rc">50</dd>
-<dt class="rc">Contest ends in</dt> <dd id="countdown" data-start="..." data-time="..." data-stop="..." class="rc">01:30</dd>
+<dt class="rc">Score</dt> <dd id="score" class="timer" data-start="..." data-stop="..." data-value="100" class="rc">50</dd>
+<dt class="rc">Contest ends in</dt> <dd id="countdown" class="timer" data-stop="..." class="rc">01:30</dd>
 </dl>
 
 <a href="/log/?problem=problem_id" id="job_log">Job log</a><br>