Skip to content

#496 - Report: add a search for comments #505

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Alzar95 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

#496 - Report: add a search for comments #505

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
46f1e52
#496 - Report: add a search for comments
Alzar95 Nov 13, 2017
b36f131
#496 - Report: add a search for comments
Alzar95 Nov 24, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 24 additions & 7 deletions backend/report.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,14 +174,18 @@ exports.restGetFilterValues = function(req, res, next) {

var filterValues = [];
fillUserValues(companyId, filterValues, next,
function() {
function () {
fillProjectValues(companyId, filterValues, next,
function() {
fillRoleValues(companyId, filterValues,
function() {
res.json(filterValues);
log.debug('-REST result: Report filters returned. Company id: %s',
companyId.toHexString());
function () {
fillLogValues(filterValues, next,
function () {
fillRoleValues(companyId, filterValues,
function () {
res.json(filterValues);
log.debug('-REST result: Report filters returned. Company id: %s',
companyId.toHexString());
}
);
}
);
}
Expand Down Expand Up @@ -440,6 +444,19 @@ function fillProjectValues(companyId, filterValues, next, callback) {
});
}

function fillLogValues(filterValues, next, callback) {
var logs = db.timelogCollection();
logs.find({})
.toArray(function (err, dblogs) {
if(!err) {
filterValues.push({field:'timelogs', value: dblogs});
callback();
} else {
next(err);
}
});
}

function fillRoleValues(companyId, filterValues, callback) {
filterValues.push({field:'role', value: company.defaultPositions});
callback();
Expand Down
2 changes: 1 addition & 1 deletion frontend/components/dropdownFilter/dropdownFilter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ angular.module('mifortTimesheet')

scope.projectFilterContainsSubstring = function (object, filter) {
var re = new RegExp(filter, 'ig');
return re.test(object.name.role || object.name.displayName || object.name);
return re.test(object.name.comment || object.name.role || object.name.displayName || object.name);
};

},
Expand Down
11 changes: 10 additions & 1 deletion frontend/report/report.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion frontend/report/reportController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,13 +302,16 @@ angular.module('mifortTimesheet.report', ['ngRoute', 'constants'])
case 'users':
filterToPush.field = 'userId';
break;
case 'timelogs':
filterToPush.field = 'comment';
break;
}

var checkedFilters = _.where(filter.value, {isChecked: true}),
usedFilterIndex = _.findIndex(usedFilters, {field: filterToPush.field});

filterToPush.value = checkedFilters.map(function (checkedFilter) {
return checkedFilter.name._id || checkedFilter.name;
return checkedFilter.name.comment || checkedFilter.name._id || checkedFilter.name;
});

if (filterToPush.value.length && usedFilterIndex == -1) {
Expand Down
5 changes: 1 addition & 4 deletions frontend/report/reportService.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,10 +128,7 @@ angular.module('mifortTimesheet.report').factory('reportService',
field: 'comment',
enableColumnResizing: true,
enableColumnMenu: false,
enableSorting: false,
enableFiltering: false,
filterHeaderTemplate: '<div class="ui-grid-filter-container"><span dropdown-filter class="dropdown-filter" col-name="time" col-title="Comment"></span></div>',
cellTemplate: '<span cutted-comment></span>'
headerCellTemplate: self.getHeaderTemplate('<span class="header-filter ui-grid-filter-container"><span dropdown-filter class="dropdown-filter" col-name="timelogs" col-title="Comment"></span></span>')
},
comments: {
field: 'comments',
Expand Down
20 changes: 18 additions & 2 deletions frontend/report/reportView.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
<input type="checkbox" id="filter-value-{{$index}}" ng-model="dynamicPopover.projectFilter.value[$index].isChecked"/>
<label for="filtered-value-{{$index}}">

{{dynamicPopover.projectFilter.value[$index].name.role || dynamicPopover.projectFilter.value[$index].name.displayName || dynamicPopover.projectFilter.value[$index].name}}
{{dynamicPopover.projectFilter.value[$index].name.comment || dynamicPopover.projectFilter.value[$index].name.role || dynamicPopover.projectFilter.value[$index].name.displayName || dynamicPopover.projectFilter.value[$index].name}}
</label>
</div>
</div>
Expand Down Expand Up @@ -135,14 +135,30 @@ <h5>Archived Project</h5>
</div>
</div>

<div ng-if="dynamicPopover.projectFilter.field == 'timelogs'">
<h5>Comments</h5>

<div ng-if="dynamicPopover.projectFilter.field == 'timelogs'"
ng-repeat="n in dynamicPopover.projectFilter.value track by $index"
ng-show="projectFilterContainsSubstring(dynamicPopover.projectFilter.value[$index], filtersFilter)"
class="filters-container">
<input type="checkbox" id="filtered-value-{{$index}}"
ng-model="dynamicPopover.projectFilter.value[$index].isChecked"/>
<label for="filtered-value-{{$index}}">
{{dynamicPopover.projectFilter.value[$index].name.comment}}
</label>
</div>
</div>


<div ng-if="dynamicPopover.projectFilter.field !== 'projectName' && dynamicPopover.projectFilter.field !== 'projects'"
ng-repeat="n in dynamicPopover.projectFilter.value track by $index"
ng-show="projectFilterContainsSubstring(dynamicPopover.projectFilter.value[$index], filtersFilter)"
class="filters-container">
<div ng-if="dynamicPopover.projectFilter.value[$index].name.external">
<input type="checkbox" id="filtered-value-{{$index}}" ng-model="dynamicPopover.projectFilter.value[$index].isChecked"/>
<label for="filtered-value-{{$index}}">
{{dynamicPopover.projectFilter.value[$index].name.role || dynamicPopover.projectFilter.value[$index].name.displayName || dynamicPopover.projectFilter.value[$index].name}}
{{dynamicPopover.projectFilter.value[$index].name.comment || dynamicPopover.projectFilter.value[$index].name.role || dynamicPopover.projectFilter.value[$index].name.displayName || dynamicPopover.projectFilter.value[$index].name}}
</label>
</div>
</div>
Expand Down