#2140 fix - Added renew period to pack, change on DB schema, fixed pack sel...

rsanchez

2014-12-11 36edce38f6b17f73322fa38404d6e01818a44fd2

 securis/src/main/webapp/licenses.html
..
..
@@ -169,19 +169,36 @@
169
169
 					</div>
170
170
 				</div>
171
171
 				<div class="form-group">
172
-					<label class="col-md-3 control-label" for="license_preactivation"
173
-						i18n>Default valid period (days)</label>
172
+					<label class="col-md-3 control-label" for="preactivation_valid_period"
173
+						i18n>Preactivation valid period (days)</label>
174
174
 					<div class="col-md-8">
175
-						<input type="number" id="default_valid_period" name="default_valid_period"
176
-						    min="1" class="form-control" ng-model="pack.default_valid_period"
175
+						<input type="number" id="preactivation_valid_period" name="preactivation_valid_period"
176
+						    min="1" class="form-control" ng-model="pack.preactivation_valid_period"
177
177
 							ng-required="pack.license_preactivation" />
178
178
 						<div class="alert inline-alert alert-warning"
179
-							ng-show="packForm.default_valid_period.$invalid">
179
+							ng-show="packForm.preactivation_valid_period.$invalid">
180
180
 							<span class="glyphicon glyphicon-warning-sign"></span> 
181
-							<span ng-show="packForm.default_valid_period.$error.required"
182
-								ng-bind="mandatoryFieldErrorMsg('Default valid period')"></span>
183
-							<span ng-show="packForm.default_valid_period.$error.min"
184
-								ng-bind="field1ShouldBeGreaterThanField2('The default valid period', '0')"></span>
181
+							<span ng-show="packForm.preactivation_valid_period.$error.required"
182
+								ng-bind="mandatoryFieldErrorMsg('Preactivation valid period')"></span>
183
+							<span ng-show="packForm.preactivation_valid_period.$error.min"
184
+								ng-bind="field1ShouldBeGreaterThanField2('The preactivation valid period', '0')"></span>
185
+						</div>
186
+					</div>
187
+				</div>
188
+				<div class="form-group">
189
+					<label class="col-md-3 control-label" for="renew_valid_period"
190
+						i18n>Period for renew (days)</label>
191
+					<div class="col-md-8">
192
+						<input type="number" id="renew_valid_period" name="renew_valid_period"
193
+						    min="1" class="form-control" ng-model="pack.renew_valid_period"
194
+							ng-required="true" />
195
+						<div class="alert inline-alert alert-warning"
196
+							ng-show="packForm.renew_valid_period.$invalid">
197
+							<span class="glyphicon glyphicon-warning-sign"></span> 
198
+							<span ng-show="packForm.renew_valid_period.$error.required"
199
+								ng-bind="mandatoryFieldErrorMsg('Period for renew')"></span>
200
+							<span ng-show="packForm.renew_valid_period.$error.min"
201
+								ng-bind="field1ShouldBeGreaterThanField2('The period for renew valid period', '0')"></span>
185
202
 						</div>
186
203
 					</div>
187
204
 				</div>
..
..
@@ -246,7 +263,7 @@
246
263
 				</div>
247
264
 
248
265
 				<div class="form-group">
249
-					<div class="col-md-offset-3 col-md-10 " id="saveContainer">
266
+					<div class="col-md-offset-3 col-md-10">
250
267
 						<button id="save" type="submit" class="btn btn-primary">
251
268
 							<span i18n class="glyphicon glyphicon-floppy-disk"></span> Save
252
269
 						</button>
..
..
@@ -274,6 +291,7 @@
274
291
 			<table class="table table-hover table-condensed">
275
292
 				<thead>
276
293
 					<tr>
294
+						<th></th>
277
295
 						<th i18n>Code</th>
278
296
 						<th i18n>Application</th>
279
297
 						<th i18n>Lic. type</th>
..
..
@@ -285,9 +303,9 @@
285
303
 				<tbody>
286
304
 					<tr ng-repeat="p in packs | filter:searchPackText"
287
305
 						ng-dblclick="editPack(p)"
288
-						ng-class="{success: currentPack.id === p.id}"
289
-						ng-click="selectPack(p)">
290
-						<td style="white-space: nowrap;" ng-bind="p.code"></td>
306
+						ng-class="{success: p._selected}" >
307
+						<td><input type="checkbox" ng-model="p._selected" ng-change="selectPack(p);"></td>
308
+						<td style="white-space: nowrap;" ng-bind="p.code" ></td>
291
309
 						<td ng-bind="p.application_name"></td>
292
310
 						<td ng-bind="p.license_type_code"></td>
293
311
 						<td ng-bind="ellipsis(p.organization_code + ' - ' + p.organization_name, 25)"
..
..
@@ -410,6 +428,14 @@
410
428
 					</div>
411
429
 				</div>
412
430
 
431
+				<div class="form-group" ng-if="!isNew">
432
+					<label class="col-md-3 control-label" i18n>Expiration date</label>
433
+					<div class="col-md-8">
434
+						<p class="form-control-static"
435
+							ng-bind="license.expiration_date | date:'fullDate'"></p>
436
+					</div>
437
+				</div>
438
+
413
439
 				<div class="form-group">
414
440
 					<label class="col-md-3 control-label" for="full_name" i18n>User
415
441
 						full name</label>
..
..
@@ -495,17 +521,6 @@
495
521
 					</div>
496
522
 				</div>
497
523
 
498
-				<div class="form-group" ng-if="!isNew && license.license_data">
499
-					<label class="col-md-3 control-label" i18n>License file</label>
500
-					<div class="col-md-8">
501
-						<p class="form-control-static" ng-bind="license.license_data"></p>
502
-						<button id="downloadLicense" class="btn btn-xs btn-link"
503
-							ng-click="downloadLicense(license)">
504
-							<span i18n class="glyphicon glyphicon-download"></span>
505
-						</button>
506
-					</div>
507
-				</div>
508
-
509
524
 				<div class="form-group" ng-if="!isNew">
510
525
 					<label class="col-md-3 control-label" i18n>Created by</label>
511
526
 					<div class="col-md-8">
..
..
@@ -573,7 +588,7 @@
573
588
 				</div>
574
589
 
575
590
 				<div class="form-group">
576
-					<div class="col-md-offset-3 col-md-9" id="saveContainer">
591
+					<div class="col-md-offset-3 col-md-9">
577
592
 						<button id="save" type="submit" class="btn btn-primary">
578
593
 							<span i18n class="glyphicon glyphicon-floppy-disk"></span> Save
579
594
 						</button>