Index: openacs-4/packages/logger/logger.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/logger/logger.info,v diff -u -N -r1.9.2.8 -r1.9.2.9 --- openacs-4/packages/logger/logger.info 15 Sep 2005 14:24:11 -0000 1.9.2.8 +++ openacs-4/packages/logger/logger.info 8 Feb 2006 21:20:26 -0000 1.9.2.9 @@ -7,18 +7,18 @@ f f - + Lars Pind Peter Marklund Jade Rubick Time and expenses reporting. - 2004-06-24 + 2006-02-08 Collaboraid Logger lets you keep track of measurements over time. The primary use case is time and expenses reporting, an area where we are being guided by the HR-XML Time Expense Reporting 2.0 standard. However, the intention is to allow for reporting of arbitrary types of numerical data such as financial results - account balance, revenue etc. You could even use this application to monitor your weight. The full specification is here: <a href="http://www.collaboraid.biz/developer/logger-spec">http://www.collaboraid.biz/developer/logger-spec<a> Logger can be optionally integrated with project-manager, for logging of time against projects and tasks. - + Index: openacs-4/packages/logger/catalog/logger.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/logger/catalog/logger.en_US.ISO-8859-1.xml,v diff -u -N -r1.1.2.3 -r1.1.2.4 --- openacs-4/packages/logger/catalog/logger.en_US.ISO-8859-1.xml 15 Sep 2005 14:24:12 -0000 1.1.2.3 +++ openacs-4/packages/logger/catalog/logger.en_US.ISO-8859-1.xml 8 Feb 2006 21:20:26 -0000 1.1.2.4 @@ -51,133 +51,9 @@ Log entry modified. Logger Application A <b>variable</b> is something you wish to track, for example: - Add a variable to project \"$project(name)\" - Add Entry" $add_link "<#_ Add new log entry"] - -set delete_link "${base_url}log-delete" - -set bulk_actions_list [list "<#_ Delete" $delete_link "<#_ Delete checked entries"] - -list::create \ - -name entries \ - -multirow entries \ - -key entry_id \ - -row_pretty_plural "entries" \ - -checkbox_name checkbox \ - -selected_format $format \ - -class "list" \ - -main_class "list" \ - -sub_class "narrow" \ - -pass_properties { - variable - } -actions $actions_list \ - -bulk_actions $bulk_actions_list \ - -bulk_action_export_vars { - return_url - } \ - -elements $elements -filters $filters \ - -groupby { - label "<#_ Group by" - type multivar - values $groupby_values - } -orderby $orderbys -formats { - normal { - label "<#_ Table" - layout table - row $normal_row - } - detailed { - label "<#_ Detailed table" - layout table - row { - checkbox { - html { rowspan 2 } - } - edit {} - project_id {} - user_id {} - time_stamp {} - value {} - } - row { - description_long { - html { colspan 5 } - hide_p 0 - } - } - } - list { - label "<#_ List" - layout list - template { - <table cellpadding="0" cellspacing="4"> - <tr> - <td valign="top"> - <listelement name="checkbox"> - </td> - <td valign="top"> - <span class="list-label">@variable.name@:</span> - <listelement name="value"> - <span class="list-label">@variable.unit@</span><br> - - <listelement name="description_long"><br> - - <span class="list-label">Project:</span> <listelement name="project_id"><br> - - <span class="list-label">By</span> <listelement name="user_id"> - <span class="list-label">on</span> <listelement name="time_stamp"> - </td> - </tr> - </table> - } - } - csv { - label "<#_ CSV" - output csv - page_size 0 - } - } - -# TODO B: With multiple categories from the same tree, make sure they're listed in correct sort_order - - - -# We add a virtual column per category tree - -# some more documentation of what's going on here would be helpful. - -set extend { edit_url delete_url delete_onclick time_stamp_pretty edit_p delete_p my_base_url my_project_manager_url project_url } -foreach id $tree_ids { - lappend extend c_${id}_category_id -} - -array set row_categories [list] -array set project_write_p [list] - -db_multirow -extend $extend -unclobber entries select_entries2 { } { - - set my_base_url $base_url - set my_project_manager_url $project_manager_url - - set project_item_id [logger::util::project_manager_project_id -project_id $project_id] - set project_url [export_vars -base "[logger::util::project_manager_url]one" {project_item_id}] - if { ![empty_string_p $tree_id] && ![empty_string_p $category_id] } { - lappend row_categories($tree_id) $category_id - } - - if { ![db_multirow_group_last_row_p -column entry_id] } { - continue - } else { - set selected_p [string equal [ns_queryget entry_id] $entry_id] - set edit_url [export_vars -base "${base_url}log" { entry_id { edit t } { return_url [ad_return_url] } }] - if { ![exists_and_not_null project_write_p($project_id)] } { - set project_write_p($project_id) [template::util::is_true [permission::permission_p -object_id $project_id -privilege write]] - } - set edit_p [expr $project_write_p($project_id) || ($user_id == [ad_conn user_id])] - set delete_p $edit_p - if { $delete_p } { - set delete_onclick "return confirm('<#_ Are you sure you want to delete log entry with $value $variable(unit) $variable(name) on $time_stamp? - Add @variables.name@ to $project(name) + Add a variable to project "%project.name%" + Add Entry" %add_link% "<#_ Add new log entry" + Add %variables.name% to %project.name% An administrator needs to associate a variable, such as time or expense, to this project before any logging can be done. An example of why this is useful is if you work for a company, which works on many different projects for different clients. In @@ -188,11 +64,11 @@ loggers would only have access to the projects that pertain to the given client. Are you sure you want to delete - Are you sure you want to delete log entry with $value $unit $variable_name on $time_stamp? - Are you sure you want to delete project @projects.name@? - Are you sure you want to delete variable @variables.name@? - Are you sure you want to delete the projection @projections.name@? - Are you sure you want to delete log entry with $value $variable(unit) $variable(name) on $time_stamp? + Are you sure you want to delete log entry with %value% %unit% %variable_name% on %time_stamp%? + Are you sure you want to delete project %projects.name%? + Are you sure you want to delete variable %variables.name%? + Are you sure you want to delete the projection %projections.name%? + Are you sure you want to delete log entry with %value% %variable.unit% %variable.name% on %time_stamp%? Before anyone can start working with the Logger application an administrator needs to setup a project. Create new projection Delete checked entries @@ -208,8 +84,8 @@ Please contact an administrator about this. Thank you. &nbsp;&nbsp;&nbsp;%progress_days%/%total_days% days Project has no variable - Project \"$name\" has been created. - Project \"$name\" has been modified. + Project "%name%" has been created. + Project "%name%" has been modified. Projects not in this logger application instance which can be linked in: Set permissions for this logger application instance Set to 100% to close the task, less to open it @@ -232,7 +108,7 @@ these %num_entries% log entries Time stamps not valid Variable is in use: you cannot delete this variable as it is being used by log entries - Variable \"$variable(name)\" has been added to \"$project(name)\". + Variable "%variable.name%" has been added to "%project.name%". Variables are <b>shared between all projects</b>, so that you can summarize the variable across projects. However, if you have many diverse projects going on, only certain variables will make sense