This commit is contained in:
@@ -114,7 +114,7 @@ namespace rockfishCore.Controllers
|
|||||||
{
|
{
|
||||||
return NotFound();
|
return NotFound();
|
||||||
}
|
}
|
||||||
var custInfo = await ct.Customer.AsNoTracking().Where(z => z.Id == site.CustomerId).Select(z => new { z.Name, z.Id, dbid = site.DbId }).SingleAsync();
|
var custInfo = await ct.Customer.AsNoTracking().Where(z => z.Id == site.CustomerId).Select(z => new { z.Name, z.Id, site.CustomerId, dbid = site.DbId }).SingleAsync();
|
||||||
return Ok(custInfo);
|
return Ok(custInfo);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -76,14 +76,16 @@ app.ravLicense = (function () {
|
|||||||
features.push({ Feature: options[i], Count: 0 });
|
features.push({ Feature: options[i], Count: 0 });
|
||||||
}
|
}
|
||||||
|
|
||||||
submitData["features"]=features;
|
submitData["features"] = features;
|
||||||
//submit
|
//submit
|
||||||
// alert("STUB submit");
|
// alert("STUB submit");
|
||||||
app.api.createRavLicense(submitData, function (res) {
|
app.api.createRavLicense(submitData, function (res) {
|
||||||
if (res.error) {
|
if (res.error) {
|
||||||
$.gevent.publish("app-show-error", res.msg);
|
$.gevent.publish("app-show-error", res.msg);
|
||||||
} else {
|
} else {
|
||||||
$("#key").val(res);
|
page(
|
||||||
|
"#!/ravLicenses/" + stateMap.id + "/" + stateMap.context.params.cust_id
|
||||||
|
);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@@ -173,7 +175,12 @@ app.ravLicense = (function () {
|
|||||||
// app.nav.contextAddLink("licenseRequests/", "Requests", "voice");
|
// app.nav.contextAddLink("licenseRequests/", "Requests", "voice");
|
||||||
// app.nav.contextAddLink("licenseTemplates/", "", "layers");
|
// app.nav.contextAddLink("licenseTemplates/", "", "layers");
|
||||||
//case 3233
|
//case 3233
|
||||||
app.nav.contextAddLink("licenses/", "List", "");
|
|
||||||
|
app.nav.contextAddLink(
|
||||||
|
"ravLicenses/" + stateMap.id + "/" + stateMap.context.params.cust_id,
|
||||||
|
"Licenses",
|
||||||
|
"ticket"
|
||||||
|
); //from here to new license
|
||||||
|
|
||||||
//set all date inputs to today plus one year
|
//set all date inputs to today plus one year
|
||||||
var oneYearFromNow = moment()
|
var oneYearFromNow = moment()
|
||||||
|
|||||||
@@ -63,7 +63,11 @@ app.ravLicenses = (function () {
|
|||||||
"<li class='my-5'>" +
|
"<li class='my-5'>" +
|
||||||
"<div class='" +
|
"<div class='" +
|
||||||
itemClass +
|
itemClass +
|
||||||
"' role='alert'><pre>" +
|
"' role='alert'>"+
|
||||||
|
"<h4>"+
|
||||||
|
app.utilB.epochToLocalShortDateTime(obj.dtCreated)+
|
||||||
|
"</h4>"+
|
||||||
|
"<pre>" +
|
||||||
obj.key +
|
obj.key +
|
||||||
"</pre></div>" +
|
"</pre></div>" +
|
||||||
"</li>"
|
"</li>"
|
||||||
@@ -77,7 +81,7 @@ app.ravLicenses = (function () {
|
|||||||
//=========/licenses==============
|
//=========/licenses==============
|
||||||
|
|
||||||
app.nav.contextClear(); ///ravLicense/122
|
app.nav.contextClear(); ///ravLicense/122
|
||||||
app.nav.contextAddLink("ravLicense/" + stateMap.id, "New", "plus");
|
app.nav.contextAddLink("ravLicense/" + stateMap.id+ "/" + stateMap.context.params.cust_id, "New", "plus");
|
||||||
app.nav.contextAddLink(
|
app.nav.contextAddLink(
|
||||||
"customerSiteEdit/" + stateMap.id + "/" + stateMap.context.params.cust_id,
|
"customerSiteEdit/" + stateMap.id + "/" + stateMap.context.params.cust_id,
|
||||||
"Site",
|
"Site",
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user