Renamed everything to 'progress' instead of 'completed'

This commit is contained in:
Nanne Baars 2016-03-28 08:37:18 +02:00
parent b4cc27c761
commit 60192db921
5 changed files with 52 additions and 13 deletions

View File

@ -18,27 +18,27 @@ import java.util.Map;
@Controller @Controller
/** /**
* <p>LessonCompletedService class.</p> * <p>LessonProgressService class.</p>
* *
* @author webgoat * @author webgoat
*/ */
public class LessonCompletedService extends BaseService { public class LessonProgressService extends BaseService {
private static final Logger logger = LoggerFactory.getLogger(LessonMenuService.class); private static final Logger logger = LoggerFactory.getLogger(LessonMenuService.class);
private LabelManager labelManager; private LabelManager labelManager;
@Autowired @Autowired
public LessonCompletedService(final LabelManager labelManager) { public LessonProgressService(final LabelManager labelManager) {
this.labelManager = labelManager; this.labelManager = labelManager;
} }
/** /**
* <p>getLessonCompletedService.</p> * <p>LessonProgressService.</p>
* *
* @param session a {@link HttpSession} object. * @param session a {@link HttpSession} object.
* @return a {@link LessonInfoModel} object. * @return a {@link LessonInfoModel} object.
*/ */
@RequestMapping(value = "/lessoncompleted.mvc", produces = "application/json") @RequestMapping(value = "/lessonprogress.mvc", produces = "application/json")
@ResponseBody @ResponseBody
public Map getLessonInfo(HttpSession session) { public Map getLessonInfo(HttpSession session) {
WebSession webSession = getWebSession(session); WebSession webSession = getWebSession(session);

View File

@ -121,7 +121,7 @@
</div> </div>
</div> </div>
<div class="col-md-12" align="left"> <div class="col-md-12" align="left">
<div id="completedMessage" class="info"></div> <div id="lesson-progress" class="info"></div>
<div id="lesson-content-wrapper" class="panel"> <div id="lesson-content-wrapper" class="panel">
</div> </div>

View File

@ -16,8 +16,8 @@ define(['jquery',
'goatApp/view/MenuButtonView', 'goatApp/view/MenuButtonView',
'goatApp/model/LessonInfoModel', 'goatApp/model/LessonInfoModel',
'goatApp/view/TitleView', 'goatApp/view/TitleView',
'goatApp/model/LessonCompletedModel', 'goatApp/model/LessonProgressModel',
'goatApp/view/LessonCompletedView' 'goatApp/view/LessonProgressView'
], ],
function($, function($,
_, _,
@ -37,8 +37,8 @@ define(['jquery',
MenuButtonView, MenuButtonView,
LessonInfoModel, LessonInfoModel,
TitleView, TitleView,
LessonCompletedModel, LessonProgressModel,
LessonCompletedView LessonProgressView
) { ) {
'use strict' 'use strict'
@ -46,8 +46,8 @@ define(['jquery',
var Controller = function(options) { var Controller = function(options) {
this.lessonContent = new LessonContentModel(); this.lessonContent = new LessonContentModel();
this.lessonCompletedModel = new LessonCompletedModel(); this.lessonProgressModel = new LessonProgressModel();
this.lessonCompletedView = new LessonCompletedView(this.lessonCompletedModel); this.lessonProgressView = new LessonProgressView(this.lessonProgressModel);
this.lessonView = options.lessonView; this.lessonView = options.lessonView;
_.extend(Controller.prototype,Backbone.Events); _.extend(Controller.prototype,Backbone.Events);
@ -134,7 +134,7 @@ define(['jquery',
$('.lesson-help').hide(); $('.lesson-help').hide();
} }
this.trigger('menu:reload'); this.trigger('menu:reload');
this.lessonCompletedModel.completed(); this.lessonProgressModel.completed();
}; };
this.addCurHelpState = function (curHelp) { this.addCurHelpState = function (curHelp) {

View File

@ -0,0 +1,13 @@
define(['jquery',
'underscore',
'backbone'],
function ($,
_,
Backbone) {
return Backbone.Model.extend({
url: 'service/lessonprogress.mvc',
completed: function () {
this.fetch();
}
});
});

View File

@ -0,0 +1,26 @@
define(['jquery',
'underscore',
'backbone',
'goatApp/model/LessonProgressModel'],
function ($,
_,
Backbone,
LessonProgressModel) {
return Backbone.View.extend({
el: '#lesson-progress',
initialize: function (lessonProgressModel) {
this.model = lessonProgressModel;
if (this.model) {
this.listenTo(this.model, 'change', this.render);
}
},
render: function () {
if (this.model.get("lessonCompleted")) {
this.$el.html(this.model.get('successMessage'));
} else {
this.$el.html("");
}
}
});
});