admin/rockfish
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
John Cardinal
2020-06-17 23:36:01 +00:00
parent c1efb235fe
commit 878d9dd772
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Controllers/RvlController.cs
View File

@@ -35,9 +35,9 @@ namespace rockfishCore.Controllers
[Required]
public bool LicenseExpires { get; set; }
[Required]
public long LicenseExpiration { get; set; }
public long LicenseExpirationDate { get; set; }
[Required]
public long MaintenanceExpiration { get; set; }
public long MaintenanceExpirationDate { get; set; }
[Required]
public List<dtoLicenseFeature> Features { get; set; }
[Required]
@@ -108,8 +108,8 @@ namespace rockfishCore.Controllers
newLicense.RegisteredTo = l.RegisteredTo;
newLicense.DbId = l.DbId;
newLicense.LicenseExpiration = DateUtil.EpochToDate(l.LicenseExpiration);
newLicense.MaintenanceExpiration = DateUtil.EpochToDate(l.MaintenanceExpiration);
newLicense.LicenseExpiration = DateUtil.EpochToDate(l.LicenseExpirationDate);
newLicense.MaintenanceExpiration = DateUtil.EpochToDate(l.MaintenanceExpirationDate);
foreach (dtoLicenseFeature f in l.Features)
{
newLicense.Features.Add(new RavenKeyFactory.LicenseFeature() { Feature = f.Feature, Count = f.Count });

6
wwwroot/js/app.ravLicense.js
View File

@@ -66,7 +66,7 @@ app.ravLicense = (function () {
var submitData = app.utilB.objectifyFormDataArray(formData);
//clean up the data before submit
debugger;
//submit
// alert("STUB submit");
app.api.createRavLicense(submitData, function (res) {
@@ -140,7 +140,7 @@ app.ravLicense = (function () {
$.gevent.publish("app-show-error", res.msg);
} else {
$("#registeredTo").val(res.name);
$("#dbId").val(res.dbId);
$("#dbId").val(res.dbid);
}
});
@@ -171,7 +171,7 @@ app.ravLicense = (function () {
.toISOString()
.substring(0, 10);
$('input[type="date"]').val(oneYearFromNow);
$("#siteid").val(stateMap.id);
$("#siteId").val(stateMap.id);
//var oneMonthFromNow = moment().add(1, 'months').toISOString().substring(0, 10);
//$('#lockoutDate').val(oneMonthFromNow);

6
wwwroot/js/templates/app.ravLicense.handlebars
View File

@@ -20,8 +20,8 @@
<div class="col-sm-6">
<div class="form-group">
<label for="maintenanceExpiration">Support expires</label>
<input class="form-control" type="date" id="maintenanceExpiration" name="maintenanceExpiration"
<label for="maintenanceExpirationDate">Support expires</label>
<input class="form-control" type="date" id="maintenanceExpirationDate" name="maintenanceExpirationDate"
value="">
</div>
</div>
@@ -32,7 +32,7 @@
<input class="form-check-input" type="checkbox" name="licenseExpires" id="licenseExpires">
Temporary key / expires
</label>
<input class="form-control" type="date" id="licenseExpiration" name="licenseExpiration" value="">
<input class="form-control" type="date" id="licenseExpirationDate" name="licenseExpirationDate" value="">
</div>
</div>