Skip to content

MOBILE-1966 glossary: Group by category mode #917

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

Merged
merged 1 commit into from
Feb 21, 2017
+479 −337
Merged

MOBILE-1966 glossary: Group by category mode #917

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
193 changes: 108 additions & 85 deletions www/addons/mod/glossary/controllers/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ angular.module('mm.addons.mod_glossary')
.controller('mmaModGlossaryIndexCtrl', function($q, $scope, $stateParams, $ionicPopover, $mmUtil, $mmCourseHelper, $mmaModGlossary,
$ionicScrollDelegate, $translate, $mmText, mmaModGlossaryComponent, mmaModGlossaryLimitEntriesNum, $state, $mmCourse,
$mmaModGlossaryOffline, $mmEvents, mmaModGlossaryAddEntryEvent, mmCoreEventOnlineStatusChanged, $mmApp, $mmSite,
mmaModGlossaryAutomSyncedEvent, $mmaModGlossarySync) {
mmaModGlossaryAutomSyncedEvent, $mmaModGlossarySync, mmaModGlossaryShowAllCategories) {

var module = $stateParams.module || {},
courseId = $stateParams.courseid,
Expand All @@ -35,7 +35,7 @@ angular.module('mm.addons.mod_glossary')
popover,
popoverScope,
viewMode, // The archetype of view (letter, date, author, cat).
fetchMode = 'letter_all', // Default.
fetchMode, // Default.
fetchFunction,
fetchInvalidate,
fetchArguments,
Expand Down Expand Up @@ -72,25 +72,27 @@ angular.module('mm.addons.mod_glossary')
$scope.description = glossary.intro || module.description;
$scope.canAdd = ($mmaModGlossary.isPluginEnabledForEditing() && glossary.canaddentry) || false;

// Preparing browse modes.
var browseModes = [
{
key: 'letter_all',
langkey: 'mma.mod_glossary.byalphabet'
},
{
key: 'search',
langkey: 'mma.mod_glossary.bysearch'
}
{key: 'search', langkey: 'mma.mod_glossary.bysearch'}
];

// Preparing browse modes.
if (glossary.browsemodes.indexOf('date') >= 0) {
browseModes.push({key: 'newest_first', langkey: 'mma.mod_glossary.bynewestfirst'});
browseModes.push({key: 'recently_updated', langkey: 'mma.mod_glossary.byrecentlyupdated'});
}
if (glossary.browsemodes.indexOf('author') >= 0) {
browseModes.push({key: 'author_all', langkey: 'mma.mod_glossary.byauthor'});
}
angular.forEach(glossary.browsemodes, function(mode) {
switch (mode) {
case 'letter' :
browseModes.push({key: 'letter_all', langkey: 'mma.mod_glossary.byalphabet'});
break;
case 'cat' :
browseModes.push({key: 'cat_all', langkey: 'mma.mod_glossary.bycategory'});
break;
case 'date' :
browseModes.push({key: 'newest_first', langkey: 'mma.mod_glossary.bynewestfirst'});
browseModes.push({key: 'recently_updated', langkey: 'mma.mod_glossary.byrecentlyupdated'});
break;
case 'author' :
browseModes.push({key: 'author_all', langkey: 'mma.mod_glossary.byauthor'});
break;
}
});

// Preparing the popover.
if (!popoverScope) {
Expand All @@ -105,8 +107,6 @@ angular.module('mm.addons.mod_glossary')
});
}
}).then(function() {
// Preparing the initial mode.
switchMode();

return fetchEntries().then(function() {
// All data obtained, now fill the context menu.
Expand Down Expand Up @@ -205,7 +205,6 @@ angular.module('mm.addons.mod_glossary')
}

$scope.pickMode = function(e) {
popoverScope.data.selectedMode = fetchMode;
popover.show(e);
};

Expand Down Expand Up @@ -306,8 +305,11 @@ angular.module('mm.addons.mod_glossary')

// Preparing the popover.
function initSortMenu() {
// Preparing the initial mode.
switchMode('letter_all');

popoverScope = $scope.$new(true);
popoverScope.data = { selectedMode: '' };
popoverScope.data = { selectedMode: fetchMode };

popoverScope.modePicked = function(mode) {
$scope.loadingMessage = loadingMessage;
Expand All @@ -324,13 +326,15 @@ angular.module('mm.addons.mod_glossary')
$scope.canLoadMore = false;
$scope.showNoEntries = false;
}
popoverScope.data.selectedMode = fetchMode;
popover.hide();
};

return $ionicPopover.fromTemplateUrl('addons/mod/glossary/templates/mode_picker.html', {
scope: popoverScope
}).then(function(po) {
popover = po;
$scope.sortMenuInit = true;
});
}

Expand Down Expand Up @@ -376,68 +380,87 @@ angular.module('mm.addons.mod_glossary')
fetchMode = mode;
$scope.isSearch = false;

// Browse by author.
if (mode == 'author_all') {
viewMode = 'author';
fetchFunction = $mmaModGlossary.getEntriesByAuthor;
fetchInvalidate = $mmaModGlossary.invalidateEntriesByAuthor;
fetchArguments = [glossary.id, 'ALL', 'LASTNAME', 'ASC'];
$scope.getDivider = function(entry) {
return entry.userfullname;
};
$scope.showDivider = function(entry, previous) {
if (typeof previous === 'undefined') {
return true;
}
return entry.userid != previous.userid;
};

// Newest first.
} else if (mode == 'newest_first') {
viewMode = 'date';
fetchFunction = $mmaModGlossary.getEntriesByDate;
fetchInvalidate = $mmaModGlossary.invalidateEntriesByDate;
fetchArguments = [glossary.id, 'CREATION', 'DESC'];
$scope.getDivider = noop;
$scope.showDivider = function() { return false; };

// Recently updated.
} else if (mode == 'recently_updated') {
viewMode = 'date';
fetchFunction = $mmaModGlossary.getEntriesByDate;
fetchInvalidate = $mmaModGlossary.invalidateEntriesByDate;
fetchArguments = [glossary.id, 'UPDATE', 'DESC'];
$scope.getDivider = noop;
$scope.showDivider = function() { return false; };

// Search for entries.
} else if (mode == 'search') {
viewMode = 'search';
fetchFunction = $mmaModGlossary.getEntriesBySearch;
fetchInvalidate = $mmaModGlossary.invalidateEntriesBySearch;
fetchArguments = false; // Dynamically set later.
$scope.isSearch = true;
$scope.getDivider = noop;
$scope.showDivider = function() { return false; };
instantFetch = false;

// Consider it is 'letter_all'.
} else {
viewMode = 'letter';
fetchMode = 'letter_all';
fetchFunction = $mmaModGlossary.getEntriesByLetter;
fetchInvalidate = $mmaModGlossary.invalidateEntriesByLetter;
fetchArguments = [glossary.id, 'ALL'];
$scope.getDivider = function(entry) {
return entry.concept.substr(0, 1).toUpperCase();
};
$scope.showDivider = function(entry, previous) {
if (typeof previous === 'undefined') {
return true;
}
return $scope.getDivider(entry) != $scope.getDivider(previous);
};
}
switch (mode) {
case 'author_all':
// Browse by author.
viewMode = 'author';
fetchFunction = $mmaModGlossary.getEntriesByAuthor;
fetchInvalidate = $mmaModGlossary.invalidateEntriesByAuthor;
fetchArguments = [glossary.id, 'ALL', 'LASTNAME', 'ASC'];
$scope.getDivider = function(entry) {
return entry.userfullname;
};
$scope.showDivider = function(entry, previous) {
if (typeof previous === 'undefined') {
return true;
}
return entry.userid != previous.userid;
};
break;
case 'cat_all':
// Browse by category.
viewMode = 'cat';
fetchFunction = $mmaModGlossary.getEntriesByCategory;
fetchInvalidate = $mmaModGlossary.invalidateEntriesByCategory;
fetchArguments = [glossary.id, mmaModGlossaryShowAllCategories];
$scope.getDivider = function(entry) {
return entry.categoryname;
};
$scope.showDivider = function(entry, previous) {
if (typeof previous === 'undefined') {
return true;
}
return $scope.getDivider(entry) != $scope.getDivider(previous);
};
break;
case 'newest_first':
// Newest first.
viewMode = 'date';
fetchFunction = $mmaModGlossary.getEntriesByDate;
fetchInvalidate = $mmaModGlossary.invalidateEntriesByDate;
fetchArguments = [glossary.id, 'CREATION', 'DESC'];
$scope.getDivider = noop;
$scope.showDivider = function() { return false; };
break;
case 'recently_updated':
// Recently updated.
viewMode = 'date';
fetchFunction = $mmaModGlossary.getEntriesByDate;
fetchInvalidate = $mmaModGlossary.invalidateEntriesByDate;
fetchArguments = [glossary.id, 'UPDATE', 'DESC'];
$scope.getDivider = noop;
$scope.showDivider = function() { return false; };
break;
case 'search':
// Search for entries.
viewMode = 'search';
fetchFunction = $mmaModGlossary.getEntriesBySearch;
fetchInvalidate = $mmaModGlossary.invalidateEntriesBySearch;
fetchArguments = false; // Dynamically set later.
$scope.isSearch = true;
$scope.getDivider = noop;
$scope.showDivider = function() { return false; };
instantFetch = false;
break;
case 'letter_all':
default:
// Consider it is 'letter_all'.
viewMode = 'letter';
fetchMode = 'letter_all';
fetchFunction = $mmaModGlossary.getEntriesByLetter;
fetchInvalidate = $mmaModGlossary.invalidateEntriesByLetter;
fetchArguments = [glossary.id, 'ALL'];
$scope.getDivider = function(entry) {
return entry.concept.substr(0, 1).toUpperCase();
};
$scope.showDivider = function(entry, previous) {
if (typeof previous === 'undefined') {
return true;
}
return $scope.getDivider(entry) != $scope.getDivider(previous);
};
break;
}

return instantFetch;
}
Expand Down
1 change: 1 addition & 0 deletions www/addons/mod/glossary/lang/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"browsemode": "Browse entries",
"byalphabet": "Alphabetically",
"byauthor": "Group by author",
"bycategory": "Group by category",
"bynewestfirst": "Newest first",
"byrecentlyupdated": "Recently updated",
"bysearch": "Search",
Expand Down
2 changes: 2 additions & 0 deletions www/addons/mod/glossary/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ angular.module('mm.addons.mod_glossary', ['mm.core'])
.constant('mmaModGlossaryAutomSyncedEvent', 'mma-mod_glossar_autom_synced')
.constant('mmaModGlossaryLimitEntriesNum', 25)
.constant('mmaModGlossaryLimitCategoriesNum', 20)
.constant('mmaModGlossaryShowAllCategories', 0)
.constant('mmaModGlossaryShowNotCategorised', -1)
.constant('mmaModGlossarySyncTime', 300000) // In milliseconds.

.config(function($stateProvider) {
Expand Down
Loading