Skip to content

Commit

Permalink
Dev 0.5 (#77)
Browse files Browse the repository at this point in the history
* 0.5 branch

* wijzigingen tekst ifv nieuwe regelgeving (#76)
  • Loading branch information
cedrikv authored Mar 6, 2019
1 parent 3a2d1ae commit 7667c80
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions ArcheologieportaalDialog.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ define([
setUrls: function() {
// VI vooronderzoek
/* jshint -W106 */
this.meldingen_vo_vi.href = this.archeologieportaalUrl +
'meldingen_vooronderzoek/beheer';
this.toelatingen_vo_vi.href = this.archeologieportaalUrl +
'toelatingen_vooronderzoek/beheer';
this.meldingen_aanvang_vo_vi.href = this.archeologieportaalUrl +
'meldingen_aanvang/meldingen_aanvang_vooronderzoek_vi/beheer';
this.arch_notas_vi.href = this.archeologieportaalUrl +
Expand Down
4 changes: 2 additions & 2 deletions SelectionDialog.js
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,8 @@ define([
var columns = {
id: 'iD',
onderwerp: 'Onderwerp',
'datum_indienen': {
label: 'Datum indienen',
'datum_melden': {
label: 'Datum melden',
formatter: lang.hitch(this, function (value) {
return dateUtils.convertIsoStringToDate(value);
})
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "oe_dojo",
"version": "0.4.1",
"version": "0.5.0",
"description": "Dojo library for Onroerend Erfgoed UI's",
"repository": {
"type": "git",
Expand Down
2 changes: 1 addition & 1 deletion resources/scss/selectionDialog.scss
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
text-align: center;
}

.dgrid .dgrid-column-datum_indienen {
.dgrid .dgrid-column-datum_melden {
width: 125px;
}

Expand Down
2 changes: 1 addition & 1 deletion templates/ArcheologieportaalDialog.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<h4><strong>Vergunningsplichtige ingrepen</strong></h4>
<h5>Vooronderzoek</h5>
<ul>
<li><a href="#" target="_blank" data-dojo-attach-point="meldingen_vo_vi">Meldingen vooronderzoek</a></li>
<li><a href="#" target="_blank" data-dojo-attach-point="toelatingen_vo_vi">Toelatingen vooronderzoek</a></li>
<li><a href="#" target="_blank" data-dojo-attach-point="meldingen_aanvang_vo_vi">Meldingen aanvang vooronderzoek</a></li>
<li><a href="#" target="_blank" data-dojo-attach-point="arch_notas_vi">Archeologienota's</a></li>
<li><a href="#" target="_blank" data-dojo-attach-point="notas_vi">Nota's</a></li>
Expand Down
6 changes: 3 additions & 3 deletions tests/manual/selectiondialog/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@
'dojo/domReady!'
], function (SelectionDialog, TrackableMemoryStore, on) {

var data = [{ id: 1, onderwerp: 'test', 'datum_indienen': '2017-01-16', archeoloog: 'Joske Vermeulen', erkenningsnummer: 'OE/ERK/Archeoloog/2015/00018'},
{ id: 2, onderwerp: 'test2', 'datum_indienen': '2017-01-16', archeoloog: 'Joske Vermeulen', erkenningsnummer: 'OE/ERK/Archeoloog/2015/00018'}];
var data = [{ id: 1, onderwerp: 'test', 'datum_melden': '2017-01-16', archeoloog: 'Joske Vermeulen', erkenningsnummer: 'OE/ERK/Archeoloog/2015/00018'},
{ id: 2, onderwerp: 'test2', 'datum_melden': '2017-01-16', archeoloog: 'Joske Vermeulen', erkenningsnummer: 'OE/ERK/Archeoloog/2015/00018'}];

var myData = [{ id: 1, onderwerp: 'myTest', 'datum_indienen': '2017-01-16', archeoloog: 'Joske Vermeulen', erkenningsnummer: 'OE/ERK/Archeoloog/2015/00018'}];
var myData = [{ id: 1, onderwerp: 'myTest', 'datum_melden': '2017-01-16', archeoloog: 'Joske Vermeulen', erkenningsnummer: 'OE/ERK/Archeoloog/2015/00018'}];

var dataStore = new TrackableMemoryStore({ data: data });
var myDataStore = new TrackableMemoryStore({ data: myData });
Expand Down

0 comments on commit 7667c80

Please sign in to comment.