From 9643c95ed88c4486edcecad01675f331a91ecbd8 Mon Sep 17 00:00:00 2001 From: David McNett Date: Wed, 6 Feb 2013 19:27:06 -0600 Subject: [PATCH] Allow resubmit=1 in request to choose activities even if they've already been posted. --- webroot/chooser.rvt | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/webroot/chooser.rvt b/webroot/chooser.rvt index 1f903ca..1a96c48 100644 --- a/webroot/chooser.rvt +++ b/webroot/chooser.rvt @@ -13,6 +13,17 @@ set title "Week" } + unset -nocomplain whereclauses + lappend whereclauses "start_time >= current_date - '$weeks week'::interval" + lappend whereclauses "user_id = $::user(id)" + + if {[info exists response(resubmit)]} { + set resubmit 1 + } else { + set resubmit 0 + lappend whereclauses "posted IS NULL" + } + ::ergkeeper::require_login puts [head "Unposted Activities from the past $title"] @@ -23,14 +34,13 @@ } puts "

[join $opts " · "]

" - form myform -defaults response -method post -name chooser -action post myform start puts [table start] puts "SelUserDateTimeDurationNotes" - pg_select $::db "SELECT *, (duration::varchar||' seconds')::interval as dur_interval FROM activities WHERE start_time >= current_date - '$weeks week'::interval AND user_id = $::user(id) AND posted IS NULL ORDER BY name, start_time" buf { + pg_select $::db "SELECT *, (duration::varchar||' seconds')::interval as dur_interval FROM activities WHERE [join $whereclauses " AND "] ORDER BY name, start_time" buf { puts "" puts "" myform checkbox sel_$buf(id)