This commit is contained in:
2022-12-27 00:19:02 +00:00
parent d3ae5ff3ee
commit 57f425eccc
14 changed files with 23 additions and 40 deletions

View File

@@ -242,6 +242,13 @@ export default {
}); });
break; break;
case socktype.GZCase:
vm.$router.push({
name: "gzcase-edit",
params: { recordid: tid.id }
});
break;
default: default:
window.$gz.eventBus.$emit( window.$gz.eventBus.$emit(
"notify-warning", "notify-warning",

View File

@@ -96,9 +96,7 @@ async function clickHandler(menuItem) {
case "extensions": case "extensions":
{ {
const res = await m.vm.$refs.extensions.open( const res = await m.vm.$refs.extensions.open(
m.vm.$refs.gzdatatable.getDataListSelection( m.vm.$refs.gzdatatable.getDataListSelection(window.$gz.type.GZCase)
window.$gz.type.GZCase
)
); );
if (res && res.refresh == true) { if (res && res.refresh == true) {
m.vm.reload = !m.vm.reload; m.vm.reload = !m.vm.reload;
@@ -108,9 +106,7 @@ async function clickHandler(menuItem) {
case "report": case "report":
{ {
const res = await m.vm.$refs.reportSelector.open( const res = await m.vm.$refs.reportSelector.open(
m.vm.$refs.gzdatatable.getDataListSelection( m.vm.$refs.gzdatatable.getDataListSelection(window.$gz.type.GZCase),
window.$gz.type.GZCase
),
m.id m.id
); );
if (res == null) { if (res == null) {
@@ -136,7 +132,6 @@ function generateMenu(vm) {
isMain: true, isMain: true,
icon: "$sockiCoffee", icon: "$sockiCoffee",
title: "GZCaseList", title: "GZCaseList",
helpUrl: "gzcases",
menuItems: [], menuItems: [],
formData: { formData: {
sockType: window.$gz.type.GZCase sockType: window.$gz.type.GZCase

View File

@@ -25,7 +25,7 @@
v-model="obj.caseId" v-model="obj.caseId"
dense dense
:readonly="formState.readOnly" :readonly="formState.readOnly"
:label="$ay.t('GZCaseId')" :label="$sock.t('GZCaseId')"
data-cy="caseId" data-cy="caseId"
:rules="[ :rules="[
form().integerValid(this, 'caseId'), form().integerValid(this, 'caseId'),
@@ -476,7 +476,6 @@ function generateMenu(vm) {
readOnly: vm.formState.readOnly, readOnly: vm.formState.readOnly,
icon: "$sockiCoffee", icon: "$sockiCoffee",
title: "GZCase", title: "GZCase",
helpUrl: "biz-gzcases",
formData: { formData: {
sockType: window.$gz.type.GZCase, sockType: window.$gz.type.GZCase,
recordId: vm.$route.params.recordid, recordId: vm.$route.params.recordid,

View File

@@ -136,7 +136,6 @@ function generateMenu(vm) {
isMain: true, isMain: true,
icon: "$sockiAddressCard", icon: "$sockiAddressCard",
title: "CustomerList", title: "CustomerList",
helpUrl: "customers",
menuItems: [], menuItems: [],
formData: { formData: {
sockType: window.$gz.type.Customer sockType: window.$gz.type.Customer

View File

@@ -134,7 +134,6 @@ function generateMenu(vm) {
isMain: true, isMain: true,
icon: "$sockiBarCode", icon: "$sockiBarCode",
title: "ProductList", title: "ProductList",
helpUrl: "products",
menuItems: [], menuItems: [],
formData: { formData: {
sockType: window.$gz.type.Product sockType: window.$gz.type.Product

View File

@@ -532,7 +532,6 @@ function generateMenu(vm) {
readOnly: vm.formState.readOnly, readOnly: vm.formState.readOnly,
icon: "$sockiBarCode", icon: "$sockiBarCode",
title: "Product", title: "Product",
helpUrl: "svc-products",
formData: { formData: {
sockType: window.$gz.type.Product, sockType: window.$gz.type.Product,
recordId: vm.$route.params.recordid, recordId: vm.$route.params.recordid,

View File

@@ -136,7 +136,6 @@ function generateMenu(vm) {
isMain: true, isMain: true,
icon: "$sockiAddressCard", icon: "$sockiAddressCard",
title: "PurchaseList", title: "PurchaseList",
helpUrl: "purchases",
menuItems: [], menuItems: [],
formData: { formData: {
sockType: window.$gz.type.Purchase sockType: window.$gz.type.Purchase

View File

@@ -600,7 +600,6 @@ function generateMenu(vm) {
readOnly: vm.formState.readOnly, readOnly: vm.formState.readOnly,
icon: "$sockiBarCode", icon: "$sockiBarCode",
title: "Purchase", title: "Purchase",
helpUrl: "svc-purchases",
formData: { formData: {
sockType: window.$gz.type.Purchase, sockType: window.$gz.type.Purchase,
recordId: vm.$route.params.recordid, recordId: vm.$route.params.recordid,

View File

@@ -136,7 +136,6 @@ function generateMenu(vm) {
isMain: true, isMain: true,
icon: "$sockiCloud", icon: "$sockiCloud",
title: "SubscriptionServerList", title: "SubscriptionServerList",
helpUrl: "subscription-servers",
menuItems: [], menuItems: [],
formData: { formData: {
sockType: window.$gz.type.SubscriptionServer sockType: window.$gz.type.SubscriptionServer

View File

@@ -1301,7 +1301,6 @@ function generateMenu(vm) {
readOnly: vm.formState.readOnly, readOnly: vm.formState.readOnly,
icon: "$sockiCloud", icon: "$sockiCloud",
title: "SubscriptionServer", title: "SubscriptionServer",
helpUrl: "svc-subscription-servers",
formData: { formData: {
sockType: window.$gz.type.SubscriptionServer, sockType: window.$gz.type.SubscriptionServer,
recordId: vm.$route.params.recordid, recordId: vm.$route.params.recordid,

View File

@@ -9,8 +9,8 @@
</gz-extensions> </gz-extensions>
<gz-data-table <gz-data-table
ref="gzdatatable" ref="gzdatatable"
form-key="customer-list" form-key="trial-license-request-list"
data-list-key="CustomerDataList" data-list-key="TrialLicenseRequestDataList"
:show-select="rights.read" :show-select="rights.read"
:reload="reload" :reload="reload"
data-cy="customersTable" data-cy="customersTable"
@@ -24,12 +24,12 @@
</template> </template>
<script> <script>
const FORM_KEY = "customer-list"; const FORM_KEY = "trial-license-request-list";
export default { export default {
data() { data() {
return { return {
rights: window.$gz.role.defaultRightsObject(), rights: window.$gz.role.defaultRightsObject(),
aType: window.$gz.type.Customer, aType: window.$gz.type.TrialLicenseRequest,
selectedItems: [], selectedItems: [],
reload: false, reload: false,
clientCriteria: undefined, clientCriteria: undefined,
@@ -37,7 +37,9 @@ export default {
}; };
}, },
created() { created() {
this.rights = window.$gz.role.getRights(window.$gz.type.Customer); this.rights = window.$gz.role.getRights(
window.$gz.type.TrialLicenseRequest
);
window.$gz.eventBus.$on("menu-click", clickHandler); window.$gz.eventBus.$on("menu-click", clickHandler);
//------ pre-filter ---- //------ pre-filter ----
@@ -97,7 +99,7 @@ async function clickHandler(menuItem) {
{ {
const res = await m.vm.$refs.extensions.open( const res = await m.vm.$refs.extensions.open(
m.vm.$refs.gzdatatable.getDataListSelection( m.vm.$refs.gzdatatable.getDataListSelection(
window.$gz.type.Customer window.$gz.type.TrialLicenseRequest
) )
); );
if (res && res.refresh == true) { if (res && res.refresh == true) {
@@ -109,7 +111,7 @@ async function clickHandler(menuItem) {
{ {
const res = await m.vm.$refs.reportSelector.open( const res = await m.vm.$refs.reportSelector.open(
m.vm.$refs.gzdatatable.getDataListSelection( m.vm.$refs.gzdatatable.getDataListSelection(
window.$gz.type.Customer window.$gz.type.TrialLicenseRequest
), ),
m.id m.id
); );
@@ -134,12 +136,11 @@ async function clickHandler(menuItem) {
function generateMenu(vm) { function generateMenu(vm) {
const menuOptions = { const menuOptions = {
isMain: true, isMain: true,
icon: "$sockiAddressCard", icon: "$sockiHandHoldingWater",
title: "CustomerList", title: "TrialLicenseRequestList",
helpUrl: "customers",
menuItems: [], menuItems: [],
formData: { formData: {
sockType: window.$gz.type.Customer sockType: window.$gz.type.TrialLicenseRequest
} }
}; };

View File

@@ -134,7 +134,6 @@ function generateMenu(vm) {
isMain: true, isMain: true,
icon: "$sockiStore", icon: "$sockiStore",
title: "VendorList", title: "VendorList",
helpUrl: "vendors",
menuItems: [], menuItems: [],
formData: { formData: {
sockType: window.$gz.type.Vendor sockType: window.$gz.type.Vendor

View File

@@ -1062,7 +1062,6 @@ function generateMenu(vm) {
readOnly: vm.formState.readOnly, readOnly: vm.formState.readOnly,
icon: "$sockiStore", icon: "$sockiStore",
title: "Vendor", title: "Vendor",
helpUrl: "vendors",
formData: { formData: {
sockType: window.$gz.type.Vendor, sockType: window.$gz.type.Vendor,
recordId: vm.$route.params.recordid, recordId: vm.$route.params.recordid,

View File

@@ -17,17 +17,7 @@ namespace Sockeye.DataList
DefaultColumns = new List<string>() { "GZCaseId", "GZCaseName", "Tags" }; DefaultColumns = new List<string>() { "GZCaseId", "GZCaseName", "Tags" };
DefaultSortBy = new Dictionary<string, string>() { { "GZCaseId", "-" } }; DefaultSortBy = new Dictionary<string, string>() { { "GZCaseId", "-" } };
FieldDefinitions = new List<DataListFieldDefinition>(); FieldDefinitions = new List<DataListFieldDefinition>();
/*
await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'GZCase', 'Case' FROM atranslation t where t.baselanguage = 'en'");
await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'GZCaseList', 'Cases' FROM atranslation t where t.baselanguage = 'en'");
await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'GZCaseId', 'Case #' FROM atranslation t where t.baselanguage = 'en'");
await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'GZCaseClosed', 'Closed' FROM atranslation t where t.baselanguage = 'en'");
await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'GZCaseName', 'Summary' FROM atranslation t where t.baselanguage = 'en'");
await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'GZCaseNotes', 'Details' FROM atranslation t where t.baselanguage = 'en'");
caseid BIGINT GENERATED BY DEFAULT AS IDENTITY NOT NULL, "
+ "created TIMESTAMPTZ NOT NULL, closed TIMESTAMPTZ, name TEXT NOT NULL, notes TEXT, "
+ "wiki TEXT, tags VARCHAR(255) ARRAY
*/
FieldDefinitions.Add(new DataListFieldDefinition FieldDefinitions.Add(new DataListFieldDefinition
{ {