2022-12-27 00:19:02 +00:00
parent d3ae5ff3ee
commit 57f425eccc
14 changed files with 23 additions and 40 deletions
--- a/client/src/api/open-object-handler.js
+++ b/client/src/api/open-object-handler.js
@@ -242,6 +242,13 @@ export default {
            });
            break;

+          case socktype.GZCase:
+            vm.$router.push({
+              name: "gzcase-edit",
+              params: { recordid: tid.id }
+            });
+            break;
+
          default:
            window.$gz.eventBus.$emit(
              "notify-warning",
--- a/client/src/views/biz-gzcase-list.vue
+++ b/client/src/views/biz-gzcase-list.vue
@@ -96,9 +96,7 @@ async function clickHandler(menuItem) {
      case "extensions":
        {
          const res = await m.vm.$refs.extensions.open(
-            m.vm.$refs.gzdatatable.getDataListSelection(
-              window.$gz.type.GZCase
-            )
+            m.vm.$refs.gzdatatable.getDataListSelection(window.$gz.type.GZCase)
          );
          if (res && res.refresh == true) {
            m.vm.reload = !m.vm.reload;
@@ -108,9 +106,7 @@ async function clickHandler(menuItem) {
      case "report":
        {
          const res = await m.vm.$refs.reportSelector.open(
-            m.vm.$refs.gzdatatable.getDataListSelection(
-              window.$gz.type.GZCase
-            ),
+            m.vm.$refs.gzdatatable.getDataListSelection(window.$gz.type.GZCase),
            m.id
          );
          if (res == null) {
@@ -136,7 +132,6 @@ function generateMenu(vm) {
    isMain: true,
    icon: "$sockiCoffee",
    title: "GZCaseList",
-    helpUrl: "gzcases",
    menuItems: [],
    formData: {
      sockType: window.$gz.type.GZCase
--- a/client/src/views/biz-gzcase.vue
+++ b/client/src/views/biz-gzcase.vue
@@ -25,7 +25,7 @@
              v-model="obj.caseId"
              dense
              :readonly="formState.readOnly"
-              :label="$ay.t('GZCaseId')"
+              :label="$sock.t('GZCaseId')"
              data-cy="caseId"
              :rules="[
                form().integerValid(this, 'caseId'),
@@ -476,7 +476,6 @@ function generateMenu(vm) {
    readOnly: vm.formState.readOnly,
    icon: "$sockiCoffee",
    title: "GZCase",
-    helpUrl: "biz-gzcases",
    formData: {
      sockType: window.$gz.type.GZCase,
      recordId: vm.$route.params.recordid,
--- a/client/src/views/biz-license-list.vue
+++ b/client/src/views/biz-license-list.vue
@@ -136,7 +136,6 @@ function generateMenu(vm) {
    isMain: true,
    icon: "$sockiAddressCard",
    title: "CustomerList",
-    helpUrl: "customers",
    menuItems: [],
    formData: {
      sockType: window.$gz.type.Customer
--- a/client/src/views/biz-product-list.vue
+++ b/client/src/views/biz-product-list.vue
@@ -134,7 +134,6 @@ function generateMenu(vm) {
    isMain: true,
    icon: "$sockiBarCode",
    title: "ProductList",
-    helpUrl: "products",
    menuItems: [],
    formData: {
      sockType: window.$gz.type.Product
--- a/client/src/views/biz-product.vue
+++ b/client/src/views/biz-product.vue
@@ -532,7 +532,6 @@ function generateMenu(vm) {
    readOnly: vm.formState.readOnly,
    icon: "$sockiBarCode",
    title: "Product",
-    helpUrl: "svc-products",
    formData: {
      sockType: window.$gz.type.Product,
      recordId: vm.$route.params.recordid,
--- a/client/src/views/biz-purchase-list.vue
+++ b/client/src/views/biz-purchase-list.vue
@@ -136,7 +136,6 @@ function generateMenu(vm) {
    isMain: true,
    icon: "$sockiAddressCard",
    title: "PurchaseList",
-    helpUrl: "purchases",
    menuItems: [],
    formData: {
      sockType: window.$gz.type.Purchase
--- a/client/src/views/biz-purchase.vue
+++ b/client/src/views/biz-purchase.vue
@@ -600,7 +600,6 @@ function generateMenu(vm) {
    readOnly: vm.formState.readOnly,
    icon: "$sockiBarCode",
    title: "Purchase",
-    helpUrl: "svc-purchases",
    formData: {
      sockType: window.$gz.type.Purchase,
      recordId: vm.$route.params.recordid,
--- a/client/src/views/biz-subscription-server-list.vue
+++ b/client/src/views/biz-subscription-server-list.vue
@@ -136,7 +136,6 @@ function generateMenu(vm) {
    isMain: true,
    icon: "$sockiCloud",
    title: "SubscriptionServerList",
-    helpUrl: "subscription-servers",
    menuItems: [],
    formData: {
      sockType: window.$gz.type.SubscriptionServer
--- a/client/src/views/biz-subscription-server.vue
+++ b/client/src/views/biz-subscription-server.vue
@@ -1301,7 +1301,6 @@ function generateMenu(vm) {
    readOnly: vm.formState.readOnly,
    icon: "$sockiCloud",
    title: "SubscriptionServer",
-    helpUrl: "svc-subscription-servers",
    formData: {
      sockType: window.$gz.type.SubscriptionServer,
      recordId: vm.$route.params.recordid,
--- a/client/src/views/biz-trial-request-list.vue
+++ b/client/src/views/biz-trial-request-list.vue
@@ -9,8 +9,8 @@
    </gz-extensions>
    <gz-data-table
      ref="gzdatatable"
-      form-key="customer-list"
-      data-list-key="CustomerDataList"
+      form-key="trial-license-request-list"
+      data-list-key="TrialLicenseRequestDataList"
      :show-select="rights.read"
      :reload="reload"
      data-cy="customersTable"
@@ -24,12 +24,12 @@
 </template>

 <script>
-const FORM_KEY = "customer-list";
+const FORM_KEY = "trial-license-request-list";
 export default {
  data() {
    return {
      rights: window.$gz.role.defaultRightsObject(),
-      aType: window.$gz.type.Customer,
+      aType: window.$gz.type.TrialLicenseRequest,
      selectedItems: [],
      reload: false,
      clientCriteria: undefined,
@@ -37,7 +37,9 @@ export default {
    };
  },
  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);

    //------ pre-filter ----
@@ -97,7 +99,7 @@ async function clickHandler(menuItem) {
        {
          const res = await m.vm.$refs.extensions.open(
            m.vm.$refs.gzdatatable.getDataListSelection(
-              window.$gz.type.Customer
+              window.$gz.type.TrialLicenseRequest
            )
          );
          if (res && res.refresh == true) {
@@ -109,7 +111,7 @@ async function clickHandler(menuItem) {
        {
          const res = await m.vm.$refs.reportSelector.open(
            m.vm.$refs.gzdatatable.getDataListSelection(
-              window.$gz.type.Customer
+              window.$gz.type.TrialLicenseRequest
            ),
            m.id
          );
@@ -134,12 +136,11 @@ async function clickHandler(menuItem) {
 function generateMenu(vm) {
  const menuOptions = {
    isMain: true,
-    icon: "$sockiAddressCard",
-    title: "CustomerList",
-    helpUrl: "customers",
+    icon: "$sockiHandHoldingWater",
+    title: "TrialLicenseRequestList",
    menuItems: [],
    formData: {
-      sockType: window.$gz.type.Customer
+      sockType: window.$gz.type.TrialLicenseRequest
    }
  };

--- a/client/src/views/biz-vendor-list.vue
+++ b/client/src/views/biz-vendor-list.vue
@@ -134,7 +134,6 @@ function generateMenu(vm) {
    isMain: true,
    icon: "$sockiStore",
    title: "VendorList",
-    helpUrl: "vendors",
    menuItems: [],
    formData: {
      sockType: window.$gz.type.Vendor
--- a/client/src/views/biz-vendor.vue
+++ b/client/src/views/biz-vendor.vue
@@ -1062,7 +1062,6 @@ function generateMenu(vm) {
    readOnly: vm.formState.readOnly,
    icon: "$sockiStore",
    title: "Vendor",
-    helpUrl: "vendors",
    formData: {
      sockType: window.$gz.type.Vendor,
      recordId: vm.$route.params.recordid,
--- a/server/DataList/GZCaseDataList.cs
+++ b/server/DataList/GZCaseDataList.cs
@@ -17,17 +17,7 @@ namespace Sockeye.DataList
            DefaultColumns = new List<string>() { "GZCaseId", "GZCaseName", "Tags" };
            DefaultSortBy = new Dictionary<string, string>() { { "GZCaseId", "-" } };
            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
            {