Skip to content
This repository has been archived by the owner on Aug 4, 2019. It is now read-only.

Release: slate-admin v2.1.13 #115

Merged
merged 3 commits into from
Oct 7, 2016
Merged

Release: slate-admin v2.1.13 #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1a756b6
Change "my classes only" toggle to checkbox in own toolbar
themightychris Oct 7, 2016
2bb7fd3
Add beforereportload event
themightychris Oct 7, 2016
4472b5b
Temporarily hide search&print navigation links
themightychris Oct 7, 2016
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
14 changes: 8 additions & 6 deletions sencha-workspace/SlateAdmin/app/controller/progress/Interims.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Ext.define('SlateAdmin.controller.progress.Interims', {

xtype: 'progress-interims-manager'
},
myClassesToggleBtn: 'progress-interims-sectionsgrid button[action=myClassesToggle]',
myClassesOnlyCheckbox: 'progress-interims-sectionsgrid checkboxfield[name=myClassesOnly]',
termSelector: 'progress-interims-sectionsgrid #termSelector',
sectionsGrid: 'progress-interims-sectionsgrid',
studentsGrid: 'progress-interims-studentsgrid',
Expand All @@ -41,8 +41,8 @@ Ext.define('SlateAdmin.controller.progress.Interims', {
activate: 'onManagerActivate'
},

myClassesToggleBtn: {
toggle: 'onMyClassesToggle'
myClassesOnlyCheckbox: {
change: 'onMyClassesOnlyCheckboxChange'
},
termSelector: {
change: 'onTermChange'
Expand Down Expand Up @@ -115,7 +115,7 @@ Ext.define('SlateAdmin.controller.progress.Interims', {
this.syncSections();
},

onMyClassesToggle: function () {
onMyClassesOnlyCheckboxChange: function () {
this.syncSections();
},

Expand Down Expand Up @@ -234,6 +234,8 @@ Ext.define('SlateAdmin.controller.progress.Interims', {
student.set('report', report, { dirty: false });
}

me.fireEvent('beforereportload', report);

editorForm.enable();
editorForm.setScrollY(0, true);
editorForm.loadRecord(report);
Expand Down Expand Up @@ -368,7 +370,7 @@ Ext.define('SlateAdmin.controller.progress.Interims', {
sectionsStore = me.getProgressInterimsSectionsStore(),
sectionsProxy = sectionsStore.getProxy(),
managerCt = me.getManagerCt(),
myClassesToggleBtn = me.getMyClassesToggleBtn(),
myClassesOnlyCheckbox = me.getMyClassesOnlyCheckbox(),
termSelector = me.getTermSelector(),
termsStore = termSelector.getStore(),
term = termSelector.getValue();
Expand Down Expand Up @@ -399,7 +401,7 @@ Ext.define('SlateAdmin.controller.progress.Interims', {
return; // setting the term will call this function again via the change event
}

sectionsProxy.setExtraParam('enrolled_user', myClassesToggleBtn.pressed ? 'current' : '');
sectionsProxy.setExtraParam('enrolled_user', myClassesOnlyCheckbox.getValue() ? 'current' : '');
sectionsProxy.setExtraParam('term', term);
sectionsStore.loadIfDirty();
},
Expand Down
16 changes: 8 additions & 8 deletions sencha-workspace/SlateAdmin/app/view/progress/NavPanel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ Ext.define('SlateAdmin.view.progress.NavPanel', {
text: 'Section Interim Reports',
href: '#progress/interims',
children: [
{
text: 'Search & Print',
href: '#progress/interims/print'
}
// {
// text: 'Search & Print',
// href: '#progress/interims/print'
// }
// {
// text: 'Email',
// href: '#progress/interims/email'
Expand All @@ -30,10 +30,10 @@ Ext.define('SlateAdmin.view.progress.NavPanel', {
text: 'Section Term Reports',
href: '#progress/narratives',
children: [
{
text: 'Search & Print',
href: '#progress/narratives/print'
}
// {
// text: 'Search & Print',
// href: '#progress/narratives/print'
// }
// {
// text: 'Email',
// href: '#progress/narratives/email'
Expand Down
47 changes: 29 additions & 18 deletions sencha-workspace/SlateAdmin/app/view/progress/interims/SectionsGrid.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,34 +4,45 @@ Ext.define('SlateAdmin.view.progress.interims.SectionsGrid', {
requires: [
'Ext.grid.column.Template',
'Ext.toolbar.Spacer',
'Ext.button.Button'
'Ext.form.field.ComboBox',
'Ext.form.field.Checkbox'
],


width: 250,
store: 'progress.interims.Sections',
componentCls: 'progress-interims-grid',
tbar: [
dockedItems: [
{
xtype: 'button',
text: 'My classes only',
action: 'myClassesToggle',
enableToggle: true
},
{
xtype: 'tbspacer'
dock: 'top',

xtype: 'toolbar',
items: [
{
itemId: 'termSelector',
flex: 1,

xtype: 'combobox',

queryMode: 'local',
store: 'Terms',
valueField: 'Handle',
displayField: 'Title',
forceSelection: true
}
]
},
{
itemId: 'termSelector',
flex: 1,

xtype: 'combobox',
dock: 'top',

queryMode: 'local',
store: 'Terms',
valueField: 'Handle',
displayField: 'Title',
forceSelection: true
xtype: 'toolbar',
items: [
{
xtype: 'checkboxfield',
boxLabel: 'Show only my classes',
name: 'myClassesOnly'
}
]
}
],
columns: [{
Expand Down