@@ -86,10 +86,10 @@ angular.module('adf.widget.redmine', ['adf.provider', 'chart.js', 'ui.bootstrap.
86
86
} ) ;
87
87
} ] ) ;
88
88
89
- angular . module ( "adf.widget.redmine" ) . run ( [ "$templateCache" , function ( $templateCache ) { $templateCache . put ( "{widgetsPath}/redmine/src/main/ chart/view.html" , "<div class=\"alert alert-info\" ng-if=!vm.chart>Please configure the widget</div><div ng-if=vm.chart><canvas id=line class=\"chart chart-line\" chart-data=vm.chart.data chart-series=vm.chart.series chart-options=vm.chart.options></canvas></div>" ) ;
90
- $templateCache . put ( "{widgetsPath}/redmine/src/main/issues/view.html" , "<style type=text/css>\n td>a{\n font-weight: bold;\n padding: 2px;\n color: white;\n border-radius: 2px 6px 6px 2px;\n background-color: #409ae3;\n }\n td>a:hover{\n color: white;\n background-color: #4183c4;\n }\n th{\n cursor: pointer;\n }\n .x-scrollable {\n width: 100%;\n max-height: 800px;\n overflow-x: auto;\n }\n\n\n</style><div class=\"alert alert-info\" ng-if=!vm.issues>Please configure the widget</div><div class=\"alert alert-info\" ng-if=\"vm.issues.total_count == 0\">No issues found</div><div ng-if=vm.issues class=x-scrollable><table class=\"table table-fixed\"><thead><tr><th ng-if=vm.config.columns.id.show ng-click=\"vm.changeOrder(\'id\')\">ID ↓</th><th ng-if=vm.config.columns.tracker.show ng-click=\"vm.changeOrder(\'tracker.name\')\">Tracker</th><th ng-if=vm.config.columns.status.show ng-click=\"vm.changeOrder(\'status.name\')\">Status</th><th ng-if=vm.config.columns.priority.show ng-click=\"vm.changeOrder(\'priority.name\')\">Priority</th><th ng-if=vm.config.columns.subject.show ng-click=\"vm.changeOrder(\'subject\')\">Subject</th><th ng-if=vm.config.columns.assignee.show ng-click=\"vm.changeOrder(\'author.name\')\">Assignee</th></tr></thead><tr ng-repeat=\"issue in vm.issues | orderBy: vm.order : vm.reverse\"><td ng-if=vm.config.columns.id.show title=\"\'ID\'\"><a href={{vm.issueUrl}}{{issue.id}}>#{{issue.id}}</a></td><td ng-if=vm.config.columns.tracker.show title=\"\'Tracker\'\">{{issue.tracker.name}}</td><td ng-if=vm.config.columns.status.show title=\"\'Status\'\">{{issue.status.name}}</td><td ng-if=vm.config.columns.priority.show title=\"\'Priority\'\">{{issue.priority.name}}</td><td ng-if=vm.config.columns.subject.show title=\"\'Subject\'\">{{issue.subject}}</td><td ng-if=vm.config.columns.assignee.show title=\"\'Assignee\'\">{{issue.author.name}}</td></tr></table></div>" ) ;
91
- $templateCache . put ( "{widgetsPath}/redmine/src/main/chart/edit/edit.html" , "<form role=form><div class=form-group><label for=project>Project</label><select name=project id=project class=form-control ng-model=vm.config.project ng-change=vm.checkUpdates() ng-required=true><option value=All>All</option><option ng-repeat=\"project in vm.projects | orderBy: \'name\'\" value={{project}}>{{project.name}}</option></select></div><p class=input-group>Add Filter<select name=filter id=filter class=form-control ng-model=vm.filterToAdd ng-change=vm.addFilter(vm.filterToAdd)><option ng-repeat=\"filter in vm.filters | orderBy: \'name\'\" value={{filter.id}}>{{filter.name}}</option></select></p><div ng-if=vm.config.filterWithVersion><label for=version>Fixed Version</label><p class=input-group ng-init=vm.updateVersions()><select name=version id=version class=form-control ng-model=vm.config.version ng-change=vm.updateVersionEnd()><option ng-repeat=\"version in vm.versions | orderBy: \'name\'\" value={{version}}>{{version.name}}</option></select><span class=input-group-btn><button class=\"btn btn-default\" ng-click=\"vm.config.filterWithVersion=false\" type=button><i class=\"glyphicon glyphicon-remove\"></i></button></span></p></div><div ng-if=vm.config.filterWithAssigned><label for=assgined_to_id>Assigned To</label> <span class=\"glyphicon glyphicon-info-sign\" uib-tooltip=\"Get issues which are assigned to the given user ID. <me> can be used instead an ID to fetch all issues from the logged in user. Leave empty if you want to see all issues.\"></span><div class=input-group><input name=assigned_to_id id=assgined_to_id class=form-control ng-model=config.assigned_to_id> <span class=input-group-btn><button class=\"btn btn-default\" ng-click=\"vm.config.filterWithAssigned=false\" type=button><i class=\"glyphicon glyphicon-remove\"></i></button></span></div></div><div ng-if=vm.config.filterWithTracker><label for=tacker>Tracker</label><div class=input-group ng-init=vm.updateTracker()><select name=tracker id=tracker class=form-control ng-model=vm.config.tracker><option ng-repeat=\"tracker in vm.trackers | orderBy: \'name\'\" value={{tracker}}>{{tracker.name}}</option></select><span class=input-group-btn><button class=\"btn btn-default\" ng-click=\"vm.config.filterWithTracker=false\" type=button><i class=\"glyphicon glyphicon-remove\"></i></button></span></div></div><div class=form-group><input type=checkbox name=showIdeal ng-model=config.showIdeal> Show ideal line</div><div><p class=input-group><input class=form-control datepicker-options=vm.dateOptions is-open=vm.popup1.opened ng-model=vm.config.timespan.fromDateTime placeholder=from show-button-bar=false type=text uib-datepicker-popup={{format}} ng-required=true> <span class=input-group-btn><button class=\"btn btn-default\" ng-click=vm.open1() type=button><i class=\"glyphicon glyphicon-calendar\"></i></button></span></p><p class=input-group><input class=form-control datepicker-options=vm.dateOptions is-open=vm.popup2.opened ng-model=vm.config.timespan.toDateTime placeholder=to show-button-bar=false type=text uib-datepicker-popup={{format}} ng-required=true> <span class=input-group-btn><button class=\"btn btn-default\" ng-click=vm.open2() type=button><i class=\"glyphicon glyphicon-calendar\"></i></button></span></p></div></form>" ) ;
92
- $templateCache . put ( "{widgetsPath}/redmine/src/main/issues/edit/edit.html" , "<form role=form><div class=form-group><label for=project>Project</label><select name=project id=project required class=form-control ng-model=config.project><option disabled select>Select a project</option><option ng-repeat=\"project in vm.projects | orderBy: \'name\'\" value={{project.id}}>{{project.name}}</option></select></div><div class=form-group><label for=customQuery>My Custom-Queries</label><select name=customQuery id=customQuery required class=form-control ng-model=config.customQuery><option disabled selected>Select your query</option><option ng-repeat=\"customQuery in vm.customQueries| orderBy: \'name\'\" value={{customQuery.id}}>{{customQuery.name}}</option></select></div><div class=form-group><input type=checkbox name=showClosed ng-model=config.showClosed> Show closed issues</div><div class=form-group><label for=project>Columns to show:</label><li class=list-group-item ng-repeat=\"(key, entry) in vm.possibleColumns\"><input type=checkbox name={{key}} ng-model=config.columns[key].show> {{entry.name}}</li></div></form>" ) ; } ] ) ;
89
+ angular . module ( "adf.widget.redmine" ) . run ( [ "$templateCache" , function ( $templateCache ) { $templateCache . put ( "{widgetsPath}/redmine/src/chart/view.html" , "<div class=\"alert alert-info\" ng-if=!vm.chart>Please configure the widget</div><div ng-if=vm.chart><canvas id=line class=\"chart chart-line\" chart-data=vm.chart.data chart-series=vm.chart.series chart-options=vm.chart.options></canvas></div>" ) ;
90
+ $templateCache . put ( "{widgetsPath}/redmine/src/issues/view.html" , "<style type=text/css>\n td>a{\n font-weight: bold;\n padding: 2px;\n color: white;\n border-radius: 2px 6px 6px 2px;\n background-color: #409ae3;\n }\n td>a:hover{\n color: white;\n background-color: #4183c4;\n }\n th{\n cursor: pointer;\n }\n .x-scrollable {\n width: 100%;\n max-height: 800px;\n overflow-x: auto;\n }\n\n\n</style><div class=\"alert alert-info\" ng-if=!vm.issues>Please configure the widget</div><div class=\"alert alert-info\" ng-if=\"vm.issues.total_count == 0\">No issues found</div><div ng-if=vm.issues class=x-scrollable><table class=\"table table-fixed\"><thead><tr><th ng-if=vm.config.columns.id.show ng-click=\"vm.changeOrder(\'id\')\">ID ↓</th><th ng-if=vm.config.columns.tracker.show ng-click=\"vm.changeOrder(\'tracker.name\')\">Tracker</th><th ng-if=vm.config.columns.status.show ng-click=\"vm.changeOrder(\'status.name\')\">Status</th><th ng-if=vm.config.columns.priority.show ng-click=\"vm.changeOrder(\'priority.name\')\">Priority</th><th ng-if=vm.config.columns.subject.show ng-click=\"vm.changeOrder(\'subject\')\">Subject</th><th ng-if=vm.config.columns.assignee.show ng-click=\"vm.changeOrder(\'author.name\')\">Assignee</th></tr></thead><tr ng-repeat=\"issue in vm.issues | orderBy: vm.order : vm.reverse\"><td ng-if=vm.config.columns.id.show title=\"\'ID\'\"><a href={{vm.issueUrl}}{{issue.id}}>#{{issue.id}}</a></td><td ng-if=vm.config.columns.tracker.show title=\"\'Tracker\'\">{{issue.tracker.name}}</td><td ng-if=vm.config.columns.status.show title=\"\'Status\'\">{{issue.status.name}}</td><td ng-if=vm.config.columns.priority.show title=\"\'Priority\'\">{{issue.priority.name}}</td><td ng-if=vm.config.columns.subject.show title=\"\'Subject\'\">{{issue.subject}}</td><td ng-if=vm.config.columns.assignee.show title=\"\'Assignee\'\">{{issue.author.name}}</td></tr></table></div>" ) ;
91
+ $templateCache . put ( "{widgetsPath}/redmine/src/chart/edit/edit.html" , "<form role=form><div class=form-group><label for=project>Project</label><select name=project id=project class=form-control ng-model=vm.config.project ng-change=vm.checkUpdates() ng-required=true><option value=All>All</option><option ng-repeat=\"project in vm.projects | orderBy: \'name\'\" value={{project}}>{{project.name}}</option></select></div><p class=input-group>Add Filter<select name=filter id=filter class=form-control ng-model=vm.filterToAdd ng-change=vm.addFilter(vm.filterToAdd)><option ng-repeat=\"filter in vm.filters | orderBy: \'name\'\" value={{filter.id}}>{{filter.name}}</option></select></p><div ng-if=vm.config.filterWithVersion><label for=version>Fixed Version</label><p class=input-group ng-init=vm.updateVersions()><select name=version id=version class=form-control ng-model=vm.config.version ng-change=vm.updateVersionEnd()><option ng-repeat=\"version in vm.versions | orderBy: \'name\'\" value={{version}}>{{version.name}}</option></select><span class=input-group-btn><button class=\"btn btn-default\" ng-click=\"vm.config.filterWithVersion=false\" type=button><i class=\"glyphicon glyphicon-remove\"></i></button></span></p></div><div ng-if=vm.config.filterWithAssigned><label for=assgined_to_id>Assigned To</label> <span class=\"glyphicon glyphicon-info-sign\" uib-tooltip=\"Get issues which are assigned to the given user ID. <me> can be used instead an ID to fetch all issues from the logged in user. Leave empty if you want to see all issues.\"></span><div class=input-group><input name=assigned_to_id id=assgined_to_id class=form-control ng-model=config.assigned_to_id> <span class=input-group-btn><button class=\"btn btn-default\" ng-click=\"vm.config.filterWithAssigned=false\" type=button><i class=\"glyphicon glyphicon-remove\"></i></button></span></div></div><div ng-if=vm.config.filterWithTracker><label for=tacker>Tracker</label><div class=input-group ng-init=vm.updateTracker()><select name=tracker id=tracker class=form-control ng-model=vm.config.tracker><option ng-repeat=\"tracker in vm.trackers | orderBy: \'name\'\" value={{tracker}}>{{tracker.name}}</option></select><span class=input-group-btn><button class=\"btn btn-default\" ng-click=\"vm.config.filterWithTracker=false\" type=button><i class=\"glyphicon glyphicon-remove\"></i></button></span></div></div><div class=form-group><input type=checkbox name=showIdeal ng-model=config.showIdeal> Show ideal line</div><div><p class=input-group><input class=form-control datepicker-options=vm.dateOptions is-open=vm.popup1.opened ng-model=vm.config.timespan.fromDateTime placeholder=from show-button-bar=false type=text uib-datepicker-popup={{format}} ng-required=true> <span class=input-group-btn><button class=\"btn btn-default\" ng-click=vm.open1() type=button><i class=\"glyphicon glyphicon-calendar\"></i></button></span></p><p class=input-group><input class=form-control datepicker-options=vm.dateOptions is-open=vm.popup2.opened ng-model=vm.config.timespan.toDateTime placeholder=to show-button-bar=false type=text uib-datepicker-popup={{format}} ng-required=true> <span class=input-group-btn><button class=\"btn btn-default\" ng-click=vm.open2() type=button><i class=\"glyphicon glyphicon-calendar\"></i></button></span></p></div></form>" ) ;
92
+ $templateCache . put ( "{widgetsPath}/redmine/src/issues/edit/edit.html" , "<form role=form><div class=form-group><label for=project>Project</label><select name=project id=project required class=form-control ng-model=config.project><option disabled select>Select a project</option><option ng-repeat=\"project in vm.projects | orderBy: \'name\'\" value={{project.id}}>{{project.name}}</option></select></div><div class=form-group><label for=customQuery>My Custom-Queries</label><select name=customQuery id=customQuery required class=form-control ng-model=config.customQuery><option disabled selected>Select your query</option><option ng-repeat=\"customQuery in vm.customQueries| orderBy: \'name\'\" value={{customQuery.id}}>{{customQuery.name}}</option></select></div><div class=form-group><input type=checkbox name=showClosed ng-model=config.showClosed> Show closed issues</div><div class=form-group><label for=project>Columns to show:</label><li class=list-group-item ng-repeat=\"(key, entry) in vm.possibleColumns\"><input type=checkbox name={{key}} ng-model=config.columns[key].show> {{entry.name}}</li></div></form>" ) ; } ] ) ;
93
93
94
94
95
95
angular . module ( 'adf.widget.redmine' )
@@ -271,8 +271,25 @@ angular.module('adf.widget.redmine')
271
271
vm . config = config ;
272
272
}
273
273
274
- if ( issues ) {
274
+ if ( ! config . columns ) {
275
+ vm . config = {
276
+ columns : {
277
+ 'id' :{ 'name' :'ID' , 'show' : true } ,
278
+ 'tracker' :{ 'name' :'Tracker' , 'show' : true } ,
279
+ 'status' :{ 'name' :'Status' , 'show' : true } ,
280
+ 'subject' :{ 'name' :'Subject' , 'show' : true } ,
281
+ 'assignee' :{ 'name' :'Assignee' , 'show' : false } ,
282
+ 'priority' :{ 'name' :'Priority' , 'show' : true }
283
+ } ,
284
+ assigned_to_id : 'me'
285
+ } ;
286
+ }
287
+
288
+ if ( issues ) {
275
289
vm . issues = issues ;
290
+ if ( issues . issues ) {
291
+ vm . issues = vm . issues . issues ;
292
+ }
276
293
}
277
294
278
295
vm . issueUrl = redmineService . getRedmineEndpoint ( ) + 'issues/' ;
@@ -298,7 +315,7 @@ angular.module('adf.widget.redmine')
298
315
var from = new Date ( config . timespan . fromDateTime ) ;
299
316
var to = new Date ( config . timespan . toDateTime ) ;
300
317
return calculateOpenIssuesPerDay ( from , to , issues , config ) ;
301
- } )
318
+ } ) ;
302
319
}
303
320
304
321
function calculateOpenIssuesPerDay ( from , to , issues , config ) {
@@ -399,7 +416,8 @@ angular.module('adf.widget.redmine')
399
416
legend : {
400
417
display : true ,
401
418
position : "bottom"
402
- }
419
+ } ,
420
+ responsive : true
403
421
} ;
404
422
405
423
vm . chart = {
0 commit comments