renamed accepted to verified

diff --git a/TODO b/TODO
index 30ba2ca..92f2564 100644 (file)
--- a/TODO
+++ b/TODO
@@ -8,7 +8,7 @@
 - add audit traces to every store: _last_modified: timestamp, _ip: ip, _userid: userid
 - count by orgnization, user.name, edit links
 - print works.summary by registration.type
-- registration.accepted: checkbox
++ registration.verified: checkbox
 ? registration.review = {
        - accpeted: checkbox
        - persons: {

diff --git a/app/js/app.js b/app/js/app.js
index d349de3..cf0efeb 100644 (file)
--- a/app/js/app.js
+++ b/app/js/app.js
@@ -7,7 +7,7 @@ angular.module('myApp', ['myApp.filters', 'myApp.services', 'myApp.directives' ]
     $routeProvider.when('/registration/:registrationId', {templateUrl: 'partials/registration.html', controller: RegistrationCtrl});
     $routeProvider.when('/confirmation/:registrationId', {templateUrl: 'partials/confirmation.html', controller: RegistrationCtrl});
     $routeProvider.when('/draft/:registrationId', {templateUrl: 'partials/draft.html', controller: RegistrationCtrl});
-    $routeProvider.when('/accepted/:registrationId', {templateUrl: 'partials/accepted.html', controller: RegistrationCtrl});
+    $routeProvider.when('/verified/:registrationId', {templateUrl: 'partials/verified.html', controller: RegistrationCtrl});
     $routeProvider.when('/list', {templateUrl: 'partials/list.html', controller: ListCtrl});
     $routeProvider.otherwise({redirectTo: '/registration/'});
   }]);

diff --git a/app/partials/accepted.html.ep b/app/partials/accepted.html.ep
deleted file mode 100644 (file)
index 7ddb4f1..0000000
--- a/app/partials/accepted.html.ep
+++ /dev/null
@@ -1,61 +0,0 @@
-<h1> Registracija i prijavljivanje izlaganja</h1>
-
-<form ng-controller="RegistrationCtrl" name="RegistrationForm" class="form-horizontal">
-
-<fieldset>
-<legend>
-<%= locale en => 'Registration status', hr => 'Status registracije' %>
-</legend>
-
-<label class="checkbox">
-<input type="checkbox" ng-model="registration.accepted">
-<%= locale
-en => 'Registration verified',
-hr => 'Provjerena registracija' %>
-</label>
-
-<fieldset>
-<legend>
-<%= locale en => 'Fees', hr => 'Plaćanja' %>
-</legend>
-
-<input
-       type="text"
-       ng-model="registration.payment.amount"
-       class="my-label-input"
-       label="<%= locale en => 'Amount', hr => 'Iznos' %>"
-       placeholder="50.00 kn"
-       ng-filter="[0-9]+[\.\,]*[0-9]+\s*(kn|eu)"
->
-
-<input
-       type="date"
-       ng-model="registration.payment.date"
-       class="my-label-input"
-       label="<%= locale en => 'Date', hr => 'Datum' %>"
->
-
-</fieldset>
-
-<button class="btn btn-primary" ng-click="update(registration,'accepted')" ng-show="RegistrationForm.$dirty">Save changes</button>
-
-%= $lang =~ m/-dev/ ? '{{registration.payment}}' : ''
-
-<div class="well">
-%= include 'registration/view'
-</div>
-
-</div>
-
-% if ( $lang =~ m/-dev/ ) {
-<pre>
-$dirty = {{RegistrationForm.$dirty}}
-$pristine = {{RegistrationForm.$pristine}}
-
-{{registration}}
-</pre>
-% }
-
-</form>
-
-

diff --git a/app/partials/list.html.ep b/app/partials/list.html.ep
index 4c3b9bd..c2db9e4 100644 (file)
--- a/app/partials/list.html.ep
+++ b/app/partials/list.html.ep
@@ -51,7 +51,7 @@ Search:
 <br>
 <button ng-click="search.$ = 'draft'">draft</button>
 <button ng-click="search.$ = 'confirmation'">confirmation</button>
-<button ng-click="search.$ = 'accepted'">accepted</button>
+<button ng-click="search.$ = 'verified'">verified</button>
 <input type="number" ng-model="pager.page" min="1" max="{{pager.last_page}}">
 <input type="number" ng-model="pager.limit">
 
@@ -67,7 +67,7 @@ Search:
 
 <li ng-repeat="registration in list">
 {{registration.nr}}
-<a class="btn btn-primary" href="#/accepted/{{registration.id}}" target="{{registration.id}}">change status</a>
+<a class="btn btn-primary" href="#/verified/{{registration.id}}" target="{{registration.id}}">change status</a>
 %= include 'registration/view'
 </li>
 

diff --git a/app/partials/verified.html.ep b/app/partials/verified.html.ep
new file mode 100644 (file)
index 0000000..511d569
--- /dev/null
+++ b/app/partials/verified.html.ep
@@ -0,0 +1,61 @@
+<h1> Registracija i prijavljivanje izlaganja</h1>
+
+<form ng-controller="RegistrationCtrl" name="RegistrationForm" class="form-horizontal">
+
+<fieldset>
+<legend>
+<%= locale en => 'Registration status', hr => 'Status registracije' %>
+</legend>
+
+<label class="checkbox">
+<input type="checkbox" ng-model="registration.verified">
+<%= locale
+en => 'Registration verified',
+hr => 'Provjerena registracija' %>
+</label>
+
+<fieldset>
+<legend>
+<%= locale en => 'Fees', hr => 'Plaćanja' %>
+</legend>
+
+<input
+       type="text"
+       ng-model="registration.payment.amount"
+       class="my-label-input"
+       label="<%= locale en => 'Amount', hr => 'Iznos' %>"
+       placeholder="50.00 kn"
+       ng-filter="[0-9]+[\.\,]*[0-9]+\s*(kn|eu)"
+>
+
+<input
+       type="date"
+       ng-model="registration.payment.date"
+       class="my-label-input"
+       label="<%= locale en => 'Date', hr => 'Datum' %>"
+>
+
+</fieldset>
+
+<button class="btn btn-primary" ng-click="update(registration,'verified')" ng-show="RegistrationForm.$dirty">Save changes</button>
+
+%= $lang =~ m/-dev/ ? '{{registration.payment}}' : ''
+
+<div class="well">
+%= include 'registration/view'
+</div>
+
+</div>
+
+% if ( $lang =~ m/-dev/ ) {
+<pre>
+$dirty = {{RegistrationForm.$dirty}}
+$pristine = {{RegistrationForm.$pristine}}
+
+{{registration}}
+</pre>
+% }
+
+</form>
+
+