This commit is contained in:
2022-08-24 21:33:22 +00:00
parent fbca9f167d
commit 60f8b3ef5a
6 changed files with 86 additions and 60 deletions

View File

@@ -5,7 +5,7 @@
1) SET VERSION 1) SET VERSION
SET app.api RFVERSION property SET app.api RFVERSION property
RENAME ?rfv=6.19 parameter in default.htm to the new version so all files update on mobile RENAME ?rfv=6.20 parameter in default.htm to the new version so all files update on mobile
1.5) Run buildtemplates.bat if handlebars templates have changed at all 1.5) Run buildtemplates.bat if handlebars templates have changed at all

View File

@@ -2,7 +2,7 @@ namespace rockfishCore.Util
{ {
public static class RfVersion public static class RfVersion
{ {
public const string NumberOnly="6.19"; public const string NumberOnly="6.20";
public const string Full = "Rockfish server " + NumberOnly; public const string Full = "Rockfish server " + NumberOnly;
} }
} }

View File

@@ -11,73 +11,73 @@
<title>Rockfish loading....</title> <title>Rockfish loading....</title>
<!-- ICONS / MANIFEST --> <!-- ICONS / MANIFEST -->
<link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png?rfv=6.19"> <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png?rfv=6.20">
<link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png?rfv=6.19"> <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png?rfv=6.20">
<link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png?rfv=6.19"> <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png?rfv=6.20">
<link rel="manifest" href="/manifest.json?rfv=6.19"> <link rel="manifest" href="/manifest.json?rfv=6.20">
<link rel="mask-icon" href="/safari-pinned-tab.svg?rfv=6.19" color="#5bbad5"> <link rel="mask-icon" href="/safari-pinned-tab.svg?rfv=6.20" color="#5bbad5">
<meta name="theme-color" content="#ffffff"> <meta name="theme-color" content="#ffffff">
<!-- 3rd party components fonts and icons --> <!-- 3rd party components fonts and icons -->
<link href="css/materialdesignicons.min.css?rfv=6.19" media="all" rel="stylesheet" type="text/css" /> <link href="css/materialdesignicons.min.css?rfv=6.20" media="all" rel="stylesheet" type="text/css" />
<link rel="stylesheet" href="css/bootstrap.min.css?rfv=6.19" type="text/css" /> <link rel="stylesheet" href="css/bootstrap.min.css?rfv=6.20" type="text/css" />
<link rel="stylesheet" href="css/app.css?rfv=6.19" type="text/css" /> <link rel="stylesheet" href="css/app.css?rfv=6.20" type="text/css" />
<link rel="stylesheet" href="css/mdi-bs4-compat.css?rfv=6.19" type="text/css" /> <link rel="stylesheet" href="css/mdi-bs4-compat.css?rfv=6.20" type="text/css" />
<!-- third-party javascript --> <!-- third-party javascript -->
<script src="js/lib/jquery-3.3.1.min.js?rfv=6.19"></script> <script src="js/lib/jquery-3.3.1.min.js?rfv=6.20"></script>
<script src="js/lib/page.js?rfv=6.19"></script> <script src="js/lib/page.js?rfv=6.20"></script>
<script src="js/lib/jquery.event.gevent.js?rfv=6.19"></script> <script src="js/lib/jquery.event.gevent.js?rfv=6.20"></script>
<script src="js/lib/jquery.gzserialize.js?rfv=6.19"></script> <script src="js/lib/jquery.gzserialize.js?rfv=6.20"></script>
<script src="js/lib/handlebars.runtime.min-v4.7.6.js?rfv=6.19"></script> <script src="js/lib/handlebars.runtime.min-v4.7.6.js?rfv=6.20"></script>
<script src="js/lib/store.min.js?rfv=6.19"></script> <script src="js/lib/store.min.js?rfv=6.20"></script>
<script src="js/lib/jquery.autocomplete.min.js?rfv=6.19"></script> <script src="js/lib/jquery.autocomplete.min.js?rfv=6.20"></script>
<script src="js/lib/moment.min.js?rfv=6.19"></script> <script src="js/lib/moment.min.js?rfv=6.20"></script>
<!-- our javascript --> <!-- our javascript -->
<script src="js/index.js?rfv=6.19"></script> <script src="js/index.js?rfv=6.20"></script>
<script src="js/app.util.js?rfv=6.19"></script> <script src="js/app.util.js?rfv=6.20"></script>
<script src="js/app.api.js?rfv=6.19"></script> <script src="js/app.api.js?rfv=6.20"></script>
<script src="js/app.utilB.js?rfv=6.19"></script> <script src="js/app.utilB.js?rfv=6.20"></script>
<script src="js/app.nav.js?rfv=6.19"></script> <script src="js/app.nav.js?rfv=6.20"></script>
<script src="js/app.shell.js?rfv=6.19"></script> <script src="js/app.shell.js?rfv=6.20"></script>
<script src="js/app.fourohfour.js?rfv=6.19"></script> <script src="js/app.fourohfour.js?rfv=6.20"></script>
<script src="js/app.authenticate.js?rfv=6.19"></script> <script src="js/app.authenticate.js?rfv=6.20"></script>
<script src="js/app.customers.js?rfv=6.19"></script> <script src="js/app.customers.js?rfv=6.20"></script>
<script src="js/app.customerEdit.js?rfv=6.19"></script> <script src="js/app.customerEdit.js?rfv=6.20"></script>
<script src="js/app.customerSites.js?rfv=6.19"></script> <script src="js/app.customerSites.js?rfv=6.20"></script>
<script src="js/app.customerSiteEdit.js?rfv=6.19"></script> <script src="js/app.customerSiteEdit.js?rfv=6.20"></script>
<script src="js/app.purchases.js?rfv=6.19"></script> <script src="js/app.purchases.js?rfv=6.20"></script>
<script src="js/app.purchaseEdit.js?rfv=6.19"></script> <script src="js/app.purchaseEdit.js?rfv=6.20"></script>
<script src="js/app.license.js?rfv=6.19"></script> <script src="js/app.license.js?rfv=6.20"></script>
<script src="js/app.licenseTemplates.js?rfv=6.19"></script> <script src="js/app.licenseTemplates.js?rfv=6.20"></script>
<script src="js/app.licenseRequestEdit.js?rfv=6.19"></script> <script src="js/app.licenseRequestEdit.js?rfv=6.20"></script>
<script src="js/app.licenses.js?rfv=6.19"></script> <script src="js/app.licenses.js?rfv=6.20"></script>
<script src="js/app.licenseView.js?rfv=6.19"></script> <script src="js/app.licenseView.js?rfv=6.20"></script>
<script src="js/app.reportData.js?rfv=6.19"></script> <script src="js/app.reportData.js?rfv=6.20"></script>
<script src="js/app.reportDataProdEmail.js?rfv=6.19"></script> <script src="js/app.reportDataProdEmail.js?rfv=6.20"></script>
<script src="js/app.reportDataExpires.js?rfv=6.19"></script> <script src="js/app.reportDataExpires.js?rfv=6.20"></script>
<script src="js/app.search.js?rfv=6.19"></script> <script src="js/app.search.js?rfv=6.20"></script>
<script src="js/app.subscription.js?rfv=6.19"></script> <script src="js/app.subscription.js?rfv=6.20"></script>
<script src="js/app.subnotify.js?rfv=6.19"></script> <script src="js/app.subnotify.js?rfv=6.20"></script>
<script src="js/app.templates.js?rfv=6.19"></script> <script src="js/app.templates.js?rfv=6.20"></script>
<script src="js/app.templateEdit.js?rfv=6.19"></script> <script src="js/app.templateEdit.js?rfv=6.20"></script>
<script src="js/app.inbox.js?rfv=6.19"></script> <script src="js/app.inbox.js?rfv=6.20"></script>
<script src="js/app.mailEdit.js?rfv=6.19"></script> <script src="js/app.mailEdit.js?rfv=6.20"></script>
<script src="js/app.rfcaseEdit.js?rfv=6.19"></script> <script src="js/app.rfcaseEdit.js?rfv=6.20"></script>
<script src="js/app.rfcases.js?rfv=6.19"></script> <script src="js/app.rfcases.js?rfv=6.20"></script>
<script src="js/app.rfsettings.js?rfv=6.19"></script> <script src="js/app.rfsettings.js?rfv=6.20"></script>
<script src="js/app.ops.js?rfv=6.19"></script> <script src="js/app.ops.js?rfv=6.20"></script>
<script src="js/app.trials.js?rfv=6.19"></script> <script src="js/app.trials.js?rfv=6.20"></script>
<script src="js/app.trialEdit.js?rfv=6.19"></script> <script src="js/app.trialEdit.js?rfv=6.20"></script>
<script src="js/app.ravLicenses.js?rfv=6.19"></script> <script src="js/app.ravLicenses.js?rfv=6.20"></script>
<script src="js/app.ravLicense.js?rfv=6.19"></script> <script src="js/app.ravLicense.js?rfv=6.20"></script>
<!-- handlebars templates --> <!-- handlebars templates -->
<script src="js/templates/templates.js?rfv=6.19"></script> <script src="js/templates/templates.js?rfv=6.20"></script>
<script> <script>
@@ -107,7 +107,7 @@ window.onerror = function ( error ) {
<body class="rf-body"> <body class="rf-body">
<div id="app" class="container"></div> <div id="app" class="container"></div>
<script src="js/lib/bootstrap.min.js?rfv=6.19"></script> <script src="js/lib/bootstrap.min.js?rfv=6.20"></script>
</body> </body>
</html> </html>

View File

@@ -29,7 +29,7 @@ app.api = (function () {
generateFromRequest, generateFromRequest,
licenseEmailResponse; licenseEmailResponse;
RockFishVersion = "6.19"; RockFishVersion = "6.20";
////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////
// NOT AUTHORIZED ERROR HANDLER // NOT AUTHORIZED ERROR HANDLER

View File

@@ -20,7 +20,9 @@ app.ravLicense = (function () {
initModule, initModule,
onGenerate, onGenerate,
onRevoke, onRevoke,
onPerpetualChanged; onPerpetualChanged,
onLicenseExpiresSetOneMonth,
onLicenseExpiresSetOneYear;
//----------------- END MODULE SCOPE VARIABLES --------------- //----------------- END MODULE SCOPE VARIABLES ---------------
//------------------- BEGIN UTILITY METHODS ------------------ //------------------- BEGIN UTILITY METHODS ------------------
@@ -128,9 +130,27 @@ app.ravLicense = (function () {
$("#perpettechcountblock").toggleClass("d-none"); $("#perpettechcountblock").toggleClass("d-none");
$("#subusercountblock").toggleClass("d-none"); $("#subusercountblock").toggleClass("d-none");
$("#subcustcountblock").toggleClass("d-none"); $("#subcustcountblock").toggleClass("d-none");
$('#licenseExpires').prop('checked', !$('#perpetual').prop('checked'));
return false; //prevent default return false; //prevent default
}; };
onLicenseExpiresSetOneMonth = function (event) {
event.preventDefault();
$('#licenseExpirationDate').val( moment().add(1, 'months').toISOString().substring(0, 10));
return false; //prevent default
};
onLicenseExpiresSetOneYear = function (event) {
event.preventDefault();
$('#licenseExpirationDate').val( moment().add(1, 'years').toISOString().substring(0, 10));
return false; //prevent default
};
// onSelectAllAddOns = function (event) { // onSelectAllAddOns = function (event) {
// event.preventDefault(); // event.preventDefault();
// $('#wbi').prop('checked', true); // $('#wbi').prop('checked', true);
@@ -239,6 +259,10 @@ app.ravLicense = (function () {
// bind actions // bind actions
$("#btn-revoke").bind("click", onRevoke); $("#btn-revoke").bind("click", onRevoke);
$("#perpetual").bind("change", onPerpetualChanged); $("#perpetual").bind("change", onPerpetualChanged);
$("#btn-license-expires-plus-one-month").bind("click", onLicenseExpiresSetOneMonth);
$("#btn-license-expires-plus-one-year").bind("click", onLicenseExpiresSetOneYear);
}; };
// return public methods // return public methods

View File

@@ -61,6 +61,8 @@
name="licenseExpirationDate" name="licenseExpirationDate"
value="" value=""
/> />
<button id="btn-license-expires-plus-one-month" class="btn btn-outline-primary">+1 Month</button>
<button id="btn-license-expires-plus-one-year" class="btn btn-outline-primary">+1 Year</button>
</div> </div>
</div> </div>