Skip to content

Commit 0abd5a8

Browse files
committed
https://numworx.atlassian.net/browse/DWOWISK-242
de gwt kant
1 parent dfbe54a commit 0abd5a8

3 files changed

Lines changed: 30 additions & 6 deletions

File tree

LeerdoelWidgetGWT/src/main/java/nl/numworx/leerdoelwidgetgwt/client/LeerdoelRecommender.java

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,13 +121,20 @@ public void onResize() {
121121
list = new DockLayoutPanel(Unit.PX);
122122
list.addStyleName("recommender");
123123
FollowFlow flow = new FollowFlow();
124-
header = new Label(rb.intro());
124+
header = new Label(intro());
125125
flow.add(header);
126126
header.addStyleName("intro");
127127
list.addNorth(flow, 50);
128128
initWidget(list);
129129
}
130130

131+
private String intro() {
132+
ObjectMap t = parent.teksten;
133+
if (t.containsKey("intro"))
134+
return t.getString("intro");
135+
return rb.intro();
136+
}
137+
131138
OpdrNavIF getComRoot() {
132139
return comRoot;
133140
}
@@ -216,7 +223,7 @@ Promise<Integer> setModelScore(DomStudentModelContext4Student studentModel, DomS
216223
stack.insert(panel, title, 2, insert);
217224
cnt ++;
218225
}
219-
if (cnt == 0) header.setText(rb.allok());
226+
if (cnt == 0) header.setText(allok());
220227
else
221228
list.add(stack);
222229
//stack.addSelectionHandler(new Selector());
@@ -227,6 +234,14 @@ Promise<Integer> setModelScore(DomStudentModelContext4Student studentModel, DomS
227234
return null;
228235
}
229236

237+
private String allok() {
238+
ObjectMap t = parent.teksten;
239+
if (t.containsKey("allok")) {
240+
return t.getString("allok");
241+
}
242+
return rb.allok();
243+
}
244+
230245
void stackResize() {
231246
SelectionEvent.fire(stack, stack.getVisibleIndex());
232247
}

LeerdoelWidgetGWT/src/main/java/nl/numworx/leerdoelwidgetgwt/client/LeerdoelWidgetGWT.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,7 @@ public void zetNagekeken(boolean b) {
244244
private LeerdoelPresenter presenter;
245245
private EastPanel east;
246246
LeerdoelRecommender recommender;
247+
ObjectMap teksten;
247248
private List<String> objectives;
248249
private int wantedheight;
249250

@@ -394,7 +395,7 @@ public DomSchoolClass getCurrentSchoolClass() {
394395
break;
395396
case RECOMMENDER:
396397
recommender = new LeerdoelRecommender(this);
397-
header = new RecommenderHeader();
398+
header = new RecommenderHeader(this);
398399
header.initialDown(visible);
399400
recommender.setComRoot(comRoot);
400401
// font overerven, altijd aan
@@ -596,7 +597,10 @@ public void init(int width, int height, Map<String, Object> launchData, Map<Stri
596597
type = Type.values()[h.getInt("type")];
597598
if (h.containsKey("objectives"))
598599
objectives = h.getStringList("objectives");
599-
600+
if (h.containsKey("teksten"))
601+
teksten = h.getObjectMap("teksten");
602+
else
603+
teksten = JSONUtilities.wrapMap(Collections.emptyMap());
600604
this.filter = convert(filter);
601605
if (activeMethod != null)
602606
this.activeMethod = new DomMethod(new PersistenceId(activeMethod));

LeerdoelWidgetGWT/src/main/java/nl/numworx/leerdoelwidgetgwt/client/RecommenderHeader.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,13 @@ public void initialDown(boolean initial) {
4242
visible = initial;
4343
}
4444

45-
public RecommenderHeader() {
46-
Label header = new Label(rb.header());
45+
public RecommenderHeader(LeerdoelWidgetGWT parent) {
46+
String tekst = rb.header();
47+
ObjectMap t = parent.teksten;
48+
if (t.containsKey("header")) {
49+
tekst = t.getString("header");
50+
}
51+
Label header = new Label(tekst);
4752
header.setStylePrimaryName("recommender-header");
4853
initWidget(header);
4954
header.addClickHandler(this);

0 commit comments

Comments
 (0)