diff --git a/src/views/biz-trial-request.vue b/src/views/biz-trial-request.vue index 18ad3c4..e5c2c4b 100644 --- a/src/views/biz-trial-request.vue +++ b/src/views/biz-trial-request.vue @@ -90,18 +90,6 @@ > - - - - - + :label="$sock.t('ProductGroup')" + > - - - @@ -192,13 +173,16 @@ export default { processed: null, status: 0, rejectReason: null, - key: null, - fetchedOn: null, - perpetual: true, + licenseId: null, + pGroup: 4, tags: [] }, + /*{"data":{"id":326,"concurrency":182740,"dbId":"pRe+Kexlu58h9iUQQa19L+PHmn/hLWscn7WbsfPVqK0=","companyName":"GZTestCo-320pm", + "contactName":"Test Testerson","email":"gzmailadmin@gmail.com","emailConfirmCode":"XjKqmiMdMx","emailValidated":true, + "requested":"0001-01-01T00:00:00Z","processed":"2023-02-21T23:30:05.80804Z","status":4,"rejectReason":"Because fuck you, that's why","licenseId":null,"pGroup":3,"tags":null}} */ selectLists: { - trialRequestStatus: [] + trialRequestStatus: [], + pGroups: [] }, formState: { ready: false, @@ -596,9 +580,7 @@ async function fetchTranslatedText() { "TrialLicenseRequestProcessed", "TrialLicenseRequestStatus", "TrialLicenseRequestRejectReason", - "TrialLicenseRequestFetchedOn", - "TrialLicenseRequestPerpetual", - "LicenseKey" + "ProductGroup" ]); } ////////////////////// @@ -610,68 +592,8 @@ async function populateSelectionLists(vm) { vm.selectLists.trialRequestStatus = window.$gz.enums.getSelectionList( "trialrequeststatus" ); + + await window.$gz.enums.fetchEnumList("productgroup"); + vm.selectLists.pGroups = window.$gz.enums.getSelectionList("productgroup"); } -/* -"CREATE TABLE atriallicenserequest (id BIGINT GENERATED ALWAYS AS IDENTITY PRIMARY KEY, dbid TEXT NOT NULL, companyname TEXT NOT NULL, " - + "contactname TEXT NOT NULL, email TEXT NOT NULL, emailconfirmcode TEXT NOT NULL, emailvalidated BOOL DEFAULT false, " - + "requested TIMESTAMPTZ NOT NULL, processed TIMESTAMPTZ, status INTEGER NOT NULL DEFAULT 0, rejectreason TEXT, key TEXT, " - + "fetchedon TIMESTAMPTZ, perpetual BOOL DEFAULT false NOT NULL, tags VARCHAR(255) ARRAY )" - - [Required] - public string DbId { get; set; } - [Required] - public string CompanyName { get; set; } - [Required] - public string ContactName { get; set; } - [Required] - public string Email { get; set; } - [Required] - public string EmailConfirmCode { get; set; } - public bool EmailValidated { get; set; } = false; - public DateTime Requested { get; set; } - public DateTime? Processed { get; set; } - public TrialRequestStatus Status { get; set; } = TrialRequestStatus.New; - public string RejectReason { get; set; } - public string Key { get; set; } - public DateTime? FetchedOn { get; set; } - public bool Perpetual { get; set; } = false; - public List Tags { get; set; } - - await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'TrialLicenseRequest', 'Trial license request' FROM atranslation t where t.baselanguage = 'en'"); - await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'TrialLicenseRequestList', 'Trial license requests' FROM atranslation t where t.baselanguage = 'en'"); - await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'TrialLicenseRequestCompanyName', 'Company' FROM atranslation t where t.baselanguage = 'en'"); - await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'TrialLicenseRequestContactName', 'Contact' FROM atranslation t where t.baselanguage = 'en'"); - await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'TrialLicenseRequestEmail', 'Email address' FROM atranslation t where t.baselanguage = 'en'"); - await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'TrialLicenseRequestEmailValidated', 'Email validated' FROM atranslation t where t.baselanguage = 'en'"); - await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'TrialLicenseRequestRequested', 'Requested' FROM atranslation t where t.baselanguage = 'en'"); - await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'TrialLicenseRequestProcessed', 'Processed' FROM atranslation t where t.baselanguage = 'en'"); - await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'TrialLicenseRequestStatus', 'Status' FROM atranslation t where t.baselanguage = 'en'"); - await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'TrialLicenseRequestRejectReason', 'Reject reason' FROM atranslation t where t.baselanguage = 'en'"); - await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'TrialLicenseRequestFetchedOn', 'Fetched' FROM atranslation t where t.baselanguage = 'en'"); - await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'TrialLicenseRequestPerpetual', 'Perpetual' FROM atranslation t where t.baselanguage = 'en'"); - await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'TrialRequestStatusNew', 'New' FROM atranslation t where t.baselanguage = 'en'"); - await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'TrialRequestStatusApproved', 'Approved' FROM atranslation t where t.baselanguage = 'en'"); - await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'TrialRequestStatusRejected', 'Rejected' FROM atranslation t where t.baselanguage = 'en'"); - -{ - "id": 0, - "concurrency": 0, - "dbId": "string", - "companyName": "string", - "contactName": "string", - "email": "string", - "emailConfirmCode": "string", - "emailValidated": true, - "requested": "2023-01-03T23:54:50.451Z", - "processed": "2023-01-03T23:54:50.451Z", - "status": 0, - "rejectReason": "string", - "key": "string", - "fetchedOn": "2023-01-03T23:54:50.451Z", - "perpetual": true, - "tags": [ - "string" - ] -} - */