Merge branch 'master' of https://gitlab.project-open.net/project-open/intranet-timesheet2

.gitignore

+# Temporary files
+*.log
+*.orig
+*~
+.\#*
+.~*
+\#*\#
+
+# Helpers
+emacs.bash
+
+

catalog/intranet-timesheet2.de_DE.ISO-8859-1.xml

@@ -134,7 +134,9 @@
   <msg key="go">los</msg>
   <msg key="Grand_Total">Gesamtsumme</msg>
   <msg key="H">H</msg>
+  <msg key="h">h</msg>
   <msg key="here">hier</msg>
+  <msg key="Hour_abbrev">h</msg>
   <msg key="Hour_logging__Casex">Erfasste Stunden</msg>
   <msg key="Hours">Stunden</msg>
   <msg key="hours">Stunden</msg>
@@ -166,7 +168,9 @@
   <msg key="Log_Absences">Abwesenheiten melden</msg>
   <msg key="Log_Absences_for_user_name">Abwesenheiten erfassen fr %user_name%</msg>
   <msg key="log_dedication">Stunden erfassen</msg>
+  <msg key="Log_for_the_week">Fr die Woche loggen</msg>
   <msg key="Log_Hours">Stunden erfassen</msg>
+  <msg key="Log_hours">Stunden loggen</msg>
   <msg key="log_hours">Stunden fr den Tag erfassen</msg>
   <msg key="Log_hours_for_the_week">Stunden fr die Woche erfassen</msg>
   <msg key="Log_hours_for_user">Stunden fr Benutzer erfassen</msg>
@@ -270,6 +274,7 @@
   <msg key="Mine">Meine</msg>
   <msg key="Monday">Montag</msg>
   <msg key="Month">Monat</msg>
+  <msg key="Month_total">Monat gesamt</msg>
   <msg key="More_currencies">Weitere Whrungen</msg>
   <msg key="N">N</msg>
   <msg key="Name">Name</msg>
@@ -325,9 +330,12 @@
   <msg key="Project">Projekt</msg>
   <msg key="Project_br_Name">Projekt-&lt;br&gt;Name</msg>
   <msg key="Project_History">Projekthistorie</msg>
+  <msg key="Project_month">Projekte Monat</msg>
   <msg key="Project_name">Aufgabenname</msg>
   <msg key="Project_Summaries">Projektzusammenfassung</msg>
   <msg key="Project_units">Projekteinheiten</msg>
+  <msg key="Project_week">Projekte Woche</msg>
+  <msg key="Projects">Projekte</msg>
   <msg key="Providers">Lieferanten</msg>
   <msg key="Q">Q</msg>
   <msg key="R">R</msg>

catalog/intranet-timesheet2.en_US.ISO-8859-1.xml

@@ -137,7 +137,9 @@
   <msg key="go">go</msg>
   <msg key="Grand_Total">Grand Total</msg>
   <msg key="H">H</msg>
+  <msg key="h">h</msg>
   <msg key="here">here</msg>
+  <msg key="Hour_abbrev">h</msg>
   <msg key="Hour_logging__Casex">Hour logging &amp; Casex</msg>
   <msg key="Hours">Hours</msg>
   <msg key="hours">hours</msg>
@@ -169,7 +171,9 @@
   <msg key="Log_Absences">Log Absences</msg>
   <msg key="Log_Absences_for_user_name">Log absences for %user_name%</msg>
   <msg key="log_dedication">log dedication</msg>
+  <msg key="Log_for_the_week">Log for the week</msg>
   <msg key="Log_Hours">Log Hours</msg>
+  <msg key="Log_hours">Log hours</msg>
   <msg key="log_hours">log hours</msg>
   <msg key="Log_hours_for_the_week">Log hours for the week</msg>
   <msg key="Log_hours_for_user">Log for:</msg>
@@ -282,6 +286,7 @@ of those units were billed hourly, for a total amount of</msg>
   <msg key="Mine">Mine</msg>
   <msg key="Monday">Monday</msg>
   <msg key="Month">Month</msg>
+  <msg key="Month_total">Month total</msg>
   <msg key="More_currencies">More currencies</msg>
   <msg key="N">N</msg>
   <msg key="Name">Name</msg>
@@ -337,9 +342,12 @@ of those units were billed hourly, for a total amount of</msg>
   <msg key="Project">Project</msg>
   <msg key="Project_br_Name">Project&lt;br&gt;Name</msg>
   <msg key="Project_History">Project History</msg>
+  <msg key="Project_month">Projects month</msg>
   <msg key="Project_name">Project name</msg>
   <msg key="Project_Summaries">Project Summaries</msg>
   <msg key="Project_units">Project units</msg>
+  <msg key="Project_week">Projects week</msg>
+  <msg key="Projects">Projects</msg>
   <msg key="Providers">Providers</msg>
   <msg key="Q">Q</msg>
   <msg key="R">R</msg>

tcl/intranet-timesheet2-procs.tcl

@@ -288,12 +288,17 @@ ad_proc -public im_timesheet_home_component {user_id} {
     set expected_hours [parameter::get -package_id [im_package_timesheet2_id] -parameter "TimesheetRedirectNumHoursInDays" -default 32]
     set available_perc [util_memoize [list db_string percent_available "select availability from im_employees where employee_id = $user_id" -default 100] 60]
     if {"" == $available_perc} { set available_perc 100 }
-    set expected_hours [expr {$expected_hours * $available_perc / 100}]
+    set expected_hours [expr $expected_hours * $available_perc / 100]
 
     set hours_html ""
     set log_them_now_link "<a href=/intranet-timesheet2/hours/index>"
     set num_hours [im_timesheet_hours_sum -user_id $user_id -number_days $num_days]
-    set absences_hours [im_timesheet_absences_sum -user_id $user_id -number_days $num_days]
+    set absence_hours [im_timesheet_absences_sum -user_id $user_id -number_days $num_days]
+    
+    set absences_hours_message ""
+    if {$absence_hours > 0} { 
+	set absences_hours_message [lang::message::lookup "" intranet-timesheet2.and_absence_hours "and %absence_hours% hours of absences"]
+    }
 
     if {$num_hours == 0} {
         set message "<b>[_ intranet-timesheet2.lt_You_havent_logged_you]</a></b>\n"
@@ -301,20 +306,15 @@ ad_proc -public im_timesheet_home_component {user_id} {
         set message "[_ intranet-timesheet2.lt_You_logged_num_hours_]"
     }
 
-    set absences_hours_message ""
-    if { [expr {$num_hours + $absences_hours}] < $expected_hours && $add_hours } {
+    if {[expr $num_hours + $absence_hours] < $expected_hours && $add_hours} {
 
-	if {$absences_hours > 0} { 
-	    set absences_hours_message [lang::message::lookup "" \
-					intranet-timesheet2.and_absences_hours \
-					"and %absences_hours% hours of absences"]
-	}
 	set default_message "
-		You have only logged %num_hours% hours %absences_hours_message% 
-		in the last %num_days% days out of %expected_hours% expected hours.
+		You have only logged $num_hours hours of project work $absences_hours_message
+		in the last $num_days days out of $expected_hours expected hours.
 	"
 	set message "<b>[lang::message::lookup "" intranet-timesheet2.You_need_to_log_hours $default_message]</b>"
 
+	# Only redirect if it's not the admin...
 	if {$redirect_p && !$admin_p} {
 	    set header [lang::message::lookup "" intranet-timesheet2.Please_Log_Your_Hours "Please Log Your Hours"]
 	    ad_returnredirect [export_vars -base "/intranet-timesheet2/hours/index" {header message}]