Merge lp:~raulraat/eventum/customFieldWeeklyReport into lp:eventum

[Raul Raat]

- add Custom Fields Weekly Report

[Raul Raat (raulraat)]

add Custom Fields Weekly Report

[Bryan Alsdorf (balsdorf)]

Raul,

In addition to the custom field weekly report when I go to merge it is also bringing in some localization changes? Is that intended?

added:
  htdocs/reports/custom_fields_weekly.php
  templates/reports/custom_fields_weekly.tpl.html
modified:
  docs/ChangeLog
  lib/eventum/class.issue.php
  lib/eventum/class.report.php
  localization/de.po
  localization/es.po
  localization/eventum.pot
  localization/lv.po
  localization/ru.po
  localization/zh_CN.po
  templates/list.tpl.html
  templates/reports/tree.tpl.html

[Elan Ruusamäe (glen666)]

On Tuesday 16 February 2010 22:10:55 Bryan Alsdorf wrote:
> Raul,
>
> In addition to the custom field weekly report when I go to merge it is also
> bringing in some localization changes? Is that intended?

i'm 100% sure it is not

after merge do bzr revert *.po *.pot and then bzr commit and bzr push :)

i'd rather regenerate the pot file on main trunk myself.

> added:
> htdocs/reports/custom_fields_weekly.php
> templates/reports/custom_fields_weekly.tpl.html
> modified:
> docs/ChangeLog
> lib/eventum/class.issue.php
> lib/eventum/class.report.php
> localization/de.po
> localization/es.po
> localization/eventum.pot
> localization/lv.po
> localization/ru.po
> localization/zh_CN.po
> templates/list.tpl.html
> templates/reports/tree.tpl.html

--
glen

[Raul Raat (raulraat)]

> On Tuesday 16 February 2010 22:10:55 Bryan Alsdorf wrote:
> > Raul,
> >
> > In addition to the custom field weekly report when I go to merge it is also
> > bringing in some localization changes? Is that intended?
>
> i'm 100% sure it is not
>
> after merge do bzr revert *.po *.pot and then bzr commit and bzr push :)
>
> i'd rather regenerate the pot file on main trunk myself.
>

Yes it was unintended.

I cloned the trunk from revision 4042 - that's the version of the trunk right now.

But i see that the mentioned files have been edited between revisions 4040 - 4042, maybe your local trunk needs bzr pull first?

[lp:~raulraat/eventum/customFieldWeeklyReport]

4043. By Elan Ruusamäe on 2010-02-17

- update to use make globs to find new locales
- use flat dir by default

4044. By Elan Ruusamäe on 2010-02-17

- use flat directory in bzr

4045. By Elan Ruusamäe on 2010-02-17

- refresh

4046. By Elan Ruusamäe on 2010-02-17

- package and build clean localization fileset

4047. By Elan Ruusamäe on 2010-02-17

- comma for readability

4048. By Elan Ruusamäe on 2010-02-17

- merge localization from launchpad

4049. By Elan Ruusamäe on 2010-02-17

- keep makefile and .po* in tarball to be able to regenerate them

4050. By Elan Ruusamäe on 2010-02-17

- handle parallel make for *.mo generation

4051. By Elan Ruusamäe on 2010-02-17

- add new lang

4052. By Bryan Alsdorf on 2010-02-18

Merged changes.
Added Custom Fields Weekly Report (Raul Raat)

=== added file 'htdocs/reports/custom_fields_weekly.php'
--- htdocs/reports/custom_fields_weekly.php	1970-01-01 00:00:00 +0000
+++ htdocs/reports/custom_fields_weekly.php	2010-02-10 14:10:30 +0000
@@ -0,0 +1,110 @@
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4 encoding=utf-8: */
+// +----------------------------------------------------------------------+
+// | Eventum - Issue Tracking System                                      |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 2010 Sun Microsystem Inc.                              |
+// |                                                                      |
+// | This program is free software; you can redistribute it and/or modify |
+// | it under the terms of the GNU General Public License as published by |
+// | the Free Software Foundation; either version 2 of the License, or    |
+// | (at your option) any later version.                                  |
+// |                                                                      |
+// | This program is distributed in the hope that it will be useful,      |
+// | but WITHOUT ANY WARRANTY; without even the implied warranty of       |
+// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        |
+// | GNU General Public License for more details.                         |
+// |                                                                      |
+// | You should have received a copy of the GNU General Public License    |
+// | along with this program; if not, write to:                           |
+// |                                                                      |
+// | Free Software Foundation, Inc.                                       |
+// | 59 Temple Place - Suite 330                                          |
+// | Boston, MA 02111-1307, USA.                                          |
+// +----------------------------------------------------------------------+
+// | Authors: Raul Raat <[e-mail]>                              |
+// +----------------------------------------------------------------------+
+//
+// @(#) $Id: $
+
+require_once dirname(__FILE__) . '/../../init.php';
+
+$tpl = new Template_Helper();
+$tpl->setTemplate("reports/custom_fields_weekly.tpl.html");
+
+Auth::checkAuthentication(APP_COOKIE);
+
+if (Auth::getCurrentRole() <= User::getRoleID("Customer")) {
+    echo "Invalid role";
+    exit;
+}
+
+$prj_id = Auth::getCurrentProject();
+
+// get list of fields and convert info useful arrays
+$fields = Custom_Field::getListByProject($prj_id, '');
+$custom_fields = array();
+$options = array();
+if (is_array($fields) && count($fields) > 0) {
+    foreach ($fields as $field) {
+        $custom_fields[$field["fld_id"]] = $field["fld_title"];
+        $options[$field["fld_id"]] = Custom_Field::getOptions($field["fld_id"]);
+    }
+} else {
+    echo ev_gettext("No custom fields for this project");
+    exit;
+}
+
+if (count(@$_POST["start"]) > 0 &&
+        (@$_POST["start"]["Year"] != 0) &&
+        (@$_POST["start"]["Month"] != 0) &&
+        (@$_POST["start"]["Day"] != 0)) {
+    $start_date = join("-", $_POST["start"]);
+}
+
+if (count(@$_POST["end"]) > 0 &&
+        (@$_POST["end"]["Year"] != 0) &&
+        (@$_POST["end"]["Month"] != 0) &&
+        (@$_POST["end"]["Day"] != 0)) {
+    $end_date = join("-", $_POST["end"]);
+}
+
+$tpl->assign(array(
+    "custom_fields" =>  $custom_fields,
+    "custom_field"  =>  @$_POST["custom_field"],
+    "options"   =>  $options,
+    "custom_options"    =>  @$_POST["custom_options"],
+    "selected_options"  => @$_REQUEST['custom_options'],
+    "start_date"    =>  @$start_date,
+    "end_date"      =>  @$end_date,
+    "report_type"   =>  @$_POST["report_type"],
+    "weeks" => Date_Helper::getWeekOptions(3,0),
+));
+
+if (empty($_POST["week"])) {
+    $tpl->assign("week", Date_Helper::getCurrentWeek());
+} else {
+    $tpl->assign("week", $_POST["week"]);
+}
+
+if (isset($_POST["custom_field"])) {
+    $tpl->assign(array(
+        "field_info"  =>  Custom_Field::getDetails($_POST['custom_field'])
+    ));
+}
+
+// split date up
+if (@$_POST["report_type"] == "weekly") {
+    $dates = explode("_", $_POST["week"]);
+} else {
+    $dates = array($start_date, $end_date);
+}
+
+if (count(@$_POST['custom_field']) > 0) {
+	$data = Report::getCustomFieldWeeklyReport($_POST["custom_field"], $_POST["custom_options"], $dates[0], $dates[1]);
+    $tpl->assign(array(
+        "data"  =>  $data
+    ));
+}
+
+$tpl->displayTemplate();

=== modified file 'lib/eventum/class.report.php'
--- lib/eventum/class.report.php	2010-01-21 15:34:01 +0000
+++ lib/eventum/class.report.php	2010-02-10 14:10:30 +0000
@@ -774,8 +774,75 @@
 
         return $data;
     }
-
-
+    /**
+     * Returns data for the custom fields weekly report, based on the field and options passed in.
+     *
+     * @access  public
+     * @param   integer $fld_id The id of the custom field.
+     * @param   array $cfo_ids An array of option ids.
+     * @param   string $start_date
+     * @param   string $end_date
+     * @return  array An array of data.
+     */
+    function getCustomFieldWeeklyReport($fld_id, $cfo_ids, $start_date, $end_date)
+    {
+        $prj_id = Auth::getCurrentProject();
+        $fld_id = Misc::escapeInteger($fld_id);
+        $cfo_ids = Misc::escapeInteger($cfo_ids);
+        // get field values
+        $options = Custom_Field::getOptions($fld_id, $cfo_ids);
+
+        $sql = "SELECT
+                    iss_id, 
+                    SUM(ttr_time_spent) ttr_time_spent_sum,
+                    iss_summary,
+                    iss_customer_id,
+                    iss_private,
+                    fld_id
+                 FROM
+                    " . APP_DEFAULT_DB . "." . APP_TABLE_PREFIX . "custom_field, 
+                    " . APP_DEFAULT_DB . "." . APP_TABLE_PREFIX . "time_tracking,";
+            if (count($options) > 0) {
+                $sql .= "
+                        " . APP_DEFAULT_DB . "." . APP_TABLE_PREFIX . "custom_field_option,";
+            }
+            $sql .= "
+                        " . APP_DEFAULT_DB . "." . APP_TABLE_PREFIX . "issue_custom_field,
+                        " . APP_DEFAULT_DB . "." . APP_TABLE_PREFIX . "issue,
+                        " . APP_DEFAULT_DB . "." . APP_TABLE_PREFIX . "issue_user
+                    WHERE
+                        ttr_created_date BETWEEN '" . Misc::escapeString($start_date) . "' AND '" . Misc::escapeString($end_date) . "' AND
+                        fld_id = icf_fld_id AND
+                       	ttr_iss_id = iss_id AND
+                  		";
+            if (count($options) > 0) {
+                $sql .=
+                        " cfo_id = icf_value AND";
+            }
+            $sql .= "
+                        icf_iss_id = iss_id AND
+                        isu_iss_id = iss_id AND
+                        icf_fld_id = $fld_id";
+            if (count($options) > 0) {
+                $sql .= " AND
+                        cfo_id IN('" . join("','", Misc::escapeString(array_keys($options))) . "')";
+            }
+            $sql .= "
+                    GROUP BY
+                        iss_id";
+
+        $res = DB_Helper::getInstance()->getAll($sql, DB_FETCHMODE_ASSOC);
+        if (PEAR::isError($res)) {
+            Error_Handler::logError(array($res->getMessage(), $res->getDebugInfo()), __FILE__, __LINE__);
+            return array();
+        } else {
+        	for ($i = 0; $i < count($res); $i++) {
+                $res[$i]['field_value'] = Custom_Field::getDisplayValue($res[$i]['iss_id'], $res[$i]['fld_id']);
+                $res[$i]['ttr_time_spent_sum_formatted'] = Misc::getFormattedTime($res[$i]['ttr_time_spent_sum'], false);
+            }
+            return $res;
+        }
+    }
     /**
      * Returns workload information for the specified date range and interval.
      *

=== added file 'templates/reports/custom_fields_weekly.tpl.html'
--- templates/reports/custom_fields_weekly.tpl.html	1970-01-01 00:00:00 +0000
+++ templates/reports/custom_fields_weekly.tpl.html	2010-02-10 14:10:30 +0000
@@ -0,0 +1,211 @@
+{include file="header.tpl.html"}
+<br />
+{literal}
+<script type="text/javascript">
+<!--
+function validateForm(f)
+{
+    if (getSelectedOption(f, 'custom_field') == -1) {
+        selectField(f, 'custom_field');
+        alert('{/literal}{t escape=js}Please select the custom field that you would like to generate a report against.{/t}{literal}');
+        return false;
+    }
+    return true;
+}
+//-->
+</script>
+{/literal}
+
+<form action="{$smarty.server.PHP_SELF}" name="custom_fields_report" method="post" onSubmit="javascript:return validateForm(this);">
+<input type="hidden" name="cat" value="generate">
+<table bgcolor="{$cell_color}" border="0" cellspacing="0" cellpadding="1" align="center" width="400">
+  <tr>
+    <td>
+      <table bgcolor="#FFFFFF" width="100%" cellspacing="1" cellpadding="2" border="0">
+        <tr>
+          <td bgcolor="{$cell_color}" colspan="3" class="default_white">
+            <b>{t}Custom Fields Weekly Report{/t}</b>
+          </td>
+        </tr>
+        <tr>
+          <td width="120" class="default">
+            <b>{t}Report Type:{/t}</b>
+          </td>
+          <td width="200" class="default" NOWRAP>
+            <input type="radio" name="report_type" value="weekly" class="default" {if $report_type!='range'}checked{/if} onClick="changeType('weekly');">
+                <a id="link" class="link" href="javascript:void(null)"
+                            onClick="javascript:checkRadio('weekly_report', 'report_type', 0);changeType('weekly');">{t}Weekly{/t}</a>&nbsp;
+            <input type="radio" name="report_type" value="range" {if $report_type=='range'}CHECKED{/if} onClick="changeType('range');">
+                <a id="link" class="link" href="javascript:void(null)"
+                            onClick="javascript:checkRadio('weekly_report', 'report_type', 1);changeType('range');">{t}Date Range{/t}</a>&nbsp;
+          </td>
+        </tr>
+        <tr id="week_row">
+          <td width="120" class="default">
+            <b>{t}Week{/t}:</b>
+          </td>
+          <td width="200">
+            <select class="default" name="week">
+                {html_options options=$weeks selected=$week}
+            </select>
+          </td>
+        </tr>
+        <tr id="start_row">
+          <td width="120" class="default">
+            <b>{t}Start{/t}:</b>
+          </td>
+          <td width="200">
+            {html_select_date time=$start_date prefix="" field_array="start" start_year="-2" end_year="+1" field_order="YMD" month_format="%b" day_value_format="%02d" all_extra="class='default'"}
+          </td>
+        </tr>
+        <tr id="end_row">
+          <td width="120" class="default">
+            <b>{t}End:{/t}</b>
+          </td>
+          <td width="200">
+            {html_select_date time=$end_date prefix="" field_array="end" start_year="-2" end_year="+1" field_order="YMD" month_format="%b" day_value_format="%02d" all_extra="class='default'"}
+          </td>
+        </tr>
+        <tr>
+          <td width="30%" class="default" align="center">
+            <b>{t}Custom Field{/t}</b>
+          </td>
+          <td width="30%" class="default" align="center">
+            <b>{t}Options{/t}</b>
+          </td>
+        </tr>
+        <tr>
+          <td align="center" valign="top" height="10">
+            <select name="custom_field" class="default" onChange="setOptions(this.options[this.selectedIndex].value, true)">
+                <option value="-1"></option>
+                {html_options options=$custom_fields selected=$custom_field}
+            </select>
+            {include file="error_icon.tpl.html" field="custom_field"}
+          </td>
+          <td align="center" valign="top">
+            <select name="custom_options[]" size="8" multiple class="default">
+            </select>
+       
+          </td>
+        </tr>
+        <tr>
+          <td width="120" class="default">
+            <b>{t}Options:{/t}</b>
+          </td>
+          <td width="200" class="default" NOWRAP>
+            <input type="checkbox" name="time_in_min" value="1" class="default" {if $smarty.post.time_in_min == 1}checked{/if}>
+            <a id="link" class="link" href="javascript:void(null)"
+                            onClick="javascript:toggleCheckbox('custom_fields_report', 'time_in_min', 0)">{t}Time spent as minutes{/t}</a>&nbsp;
+            <br />
+          </td>
+        </tr>
+        
+        <tr>
+          <td colspan="2" align="center">
+            <input type="submit" name="cat" value="{t}Generate{/t}" class="shortcut">
+          </td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+</form>
+<script type="text/javascript">
+var options = new Array();
+var option_to_fld_id = new Array();
+{foreach from=$options key=fld_id item=option_list name=option_list}
+    option_to_fld_id[{$smarty.foreach.option_list.iteration-1}] = {$fld_id};
+    options[{$smarty.foreach.option_list.iteration-1}] = new Array();
+    {foreach from=$option_list key=cfo_id item=cfo_value name=option}
+        options[{$smarty.foreach.option_list.iteration-1}][{$smarty.foreach.option.iteration-1}] = new Option('{$cfo_value}', '{$cfo_id}');
+    {/foreach}
+{/foreach}
+
+{literal}
+var options_field = document.forms['custom_fields_report'].elements['custom_options[]'];
+function setOptions(fld_id, auto_select)
+{
+    fld_id_index = '';
+    for (i = 0; i < option_to_fld_id.length; i++) {
+        if (option_to_fld_id[i] == fld_id) {
+            fld_id_index = i;
+        }
+    }
+
+    options_field.length = 0;
+    if (options[fld_id_index]) {
+        options_field.length = options[fld_id_index].length;
+        for (i = 0; i < options[fld_id_index].length; i++) {
+            options_field.options[i] = options[fld_id_index][i];
+            options_field.options[i].selected = auto_select;
+        }
+    }
+}
+function changeType(type) {
+    if (type == 'range') {
+        document.getElementById('week_row').style.display = 'none';
+        document.getElementById('start_row').style.display = getDisplayStyle();
+        document.getElementById('end_row').style.display = getDisplayStyle();
+    } else {
+        document.getElementById('week_row').style.display = getDisplayStyle();
+        document.getElementById('start_row').style.display = 'none';
+        document.getElementById('end_row').style.display = 'none';
+    }
+}
+{/literal}
+changeType('{$report_type}');
+
+setOptions('{$custom_field}', false);
+{if $custom_options|@count > 0}
+    {foreach from=$custom_options key=option_index item=option}
+      {literal}
+      for (i = 0; i < options_field.options.length; i++) {
+        if (options_field.options[i].value == '{/literal}{$option}{literal}') {
+          options_field.options[i].selected = true;
+        }
+      }
+      {/literal}
+    {/foreach}
+{/if}
+</script>
+
+{if $data|@count > 0}
+{assign var="colspan" value=4}
+<table bgcolor="{$cell_color}" border="0" cellspacing="0" cellpadding="1" align="center">
+  <tr>
+    <td>
+      <table bgcolor="#FFFFFF" width="100%" cellspacing="1" cellpadding="2" border="0">
+        <tr>
+          <td bgcolor="{$cell_color}" colspan="{$colspan}" class="default_white">
+            <b>{t}Issues/Customers matching criteria{/t}</b>
+          </td>
+        </tr>
+        <tr>
+          <td bgcolor="{$cell_color}" class="default_white">{t}Issue ID{/t}</td>
+          <td bgcolor="{$cell_color}" class="default_white">{t}Summary{/t}</td>
+          <td bgcolor="{$cell_color}" class="default_white">{t}Time Spent{/t}</td>
+          <td bgcolor="{$cell_color}" class="default_white">{$field_info.fld_title}</td>
+        </tr>
+        {foreach from=$data item=row}
+        {cycle values=$cycle assign="row_color"}
+        <tr>
+          <td class="default" bgcolor="{$row_color}" align="right">
+            <a href="{$app_base_url}view.php?id={$row.iss_id}" class="link">{$row.iss_id}</a>
+          </td>
+          <td class="default" bgcolor="{$row_color}">{$row.iss_summary}</td>
+          <td class="default" bgcolor="{$row_color}">{if $smarty.post.time_in_min == 1}{$row.ttr_time_spent_sum}{else}{$row.ttr_time_spent_sum_formatted}{/if}</td>
+          <td class="default" bgcolor="{$row_color}">{$row.field_value}</td>
+        </tr>
+        {foreachelse}
+        <tr>
+            <td colspan="8" class="default" align="center" bgcolor="{$dark_color}"><i>{t}No data found{/t}</i></td>
+        </tr>
+        {/foreach}
+      </table>
+    </td>
+  </tr>
+</table>
+{/if}
+
+
+{include file="footer.tpl.html"}
\ No newline at end of file

=== modified file 'templates/reports/tree.tpl.html'
--- templates/reports/tree.tpl.html	2008-05-16 07:09:52 +0000
+++ templates/reports/tree.tpl.html	2010-02-10 14:10:30 +0000
@@ -35,6 +35,7 @@
 tree.add(6, 0, '{t escape=js}Workload by time period{/t}', 'workload_time_period.php', '', 'basefrm');
 tree.add(7, 0, '{t escape=js}Email by time period{/t}', 'workload_time_period.php?type=email', '', 'basefrm');
 tree.add(8, 0, '{t escape=js}Custom Fields{/t}', 'custom_fields.php', '', 'basefrm');
+tree.add(8, 0, '{t escape=js}Custom Fields Weekly Report{/t}', 'custom_fields_weekly.php', '', 'basefrm');
 tree.add(9, 0, '{t escape=js}Customer Profile Stats{/t}', 'customer_stats.php', '', 'basefrm');
 tree.add(10, 0, '{t escape=js}Recent Activity{/t}', 'recent_activity.php', '', 'basefrm');
 tree.add(11, 0, '{t escape=js}Workload By Date Range{/t}', 'workload_date_range.php', '', 'basefrm');