- Installa APP: Messaggio in CIMA

- in sistemazione: select compare la scelta di prima.
2022-12-07 18:16:23 +01:00
parent 077c2dbd9e
commit 944d121943
29 changed files with 1119 additions and 752 deletions
--- a/src/store/Modules/costanti.ts
+++ b/src/store/Modules/costanti.ts
@@ -317,6 +317,7 @@ export const costanti = {
    multiselect_by_server: 4010,
    nationality: 4096,
    intcode: 5000,
+    option: 5500,
    multioption: 6000,
    onlydate: 7000,
    hours: 8000,
--- a/src/store/Modules/fieldsTable.ts
+++ b/src/store/Modules/fieldsTable.ts
@@ -77,6 +77,8 @@ function AddCol(params: IColGridTable) {
    field_outtype: (params.field_outtype === undefined) ? costanti.FieldType.string : params.field_outtype,
    tipovisu: (params.tipovisu === undefined) ? costanti.TipoVisu.NONE : params.tipovisu,
    link: (params.link === undefined) ? '' : params.link,
+    typeobj: (params.typeobj === undefined) ? '' : params.typeobj,
+    inline: (params.inline === undefined) ? '' : params.inline,
    askaction: (params.askaction === undefined) ? '' : params.askaction,
    tablesel: (params.tablesel === undefined) ? '' : params.tablesel,
    jointable: (params.jointable === undefined) ? '' : params.jointable,
@@ -86,6 +88,7 @@ function AddCol(params: IColGridTable) {
    allowchar: (params.allowchar === undefined) ? null : params.allowchar,
    showWhen: (params.showWhen === undefined) ? costanti.showWhen.NewRec + costanti.showWhen.InEdit + costanti.showWhen.InView : params.showWhen,
    noshowlabel: (params.noshowlabel === undefined) ? false : params.noshowlabel,
+    numpag_carousel: (params.numpag_carousel === undefined) ? 0 : params.numpag_carousel,
    notsave: (params.notsave === undefined) ? false : params.notsave,
    filter_table: (params.filter_table === undefined) ? '' : params.filter_table,
    remote_table: (params.remote_table === undefined) ? '' : params.remote_table,
@@ -830,7 +833,7 @@ export const colmyGoods = [
    titlepopupedit: 'Dettagli', field_extra1: 'username', subfield_extra1: '',
    minlength: 50,
    isadvanced_field: true,
-    required: true,
+    required: false,
  }),
  AddCol({
    name: 'idSectorGood',
@@ -940,15 +943,31 @@ export const colmyGoods = [
 ]

 export const colmySkills = [
+  AddCol({
+    name: 'adType',
+    label_trans: 'adTypes.name',
+    fieldtype: costanti.FieldType.multioption,
+    required: true,
+    jointable: 'adtypes',
+    showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit,
+    icon: 'fas fa-bullhorn',
+    noshowlabel: true,
+    numpag_carousel: 1,
+    inline: true,
+    typeobj: 'radio',
+  }),
  AddCol({
    name: 'idStatusSkill',
    label_trans: 'statusSkill.name',
-    fieldtype: costanti.FieldType.multiselect,
+    fieldtype: costanti.FieldType.multioption,
    jointable: 'statusSkills',
    showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView_OnlyifExist,
    noshowlabel: true,
    icon: 'mood',
    required: true,
+    numpag_carousel: 1,
+    inline: true,
+    typeobj: 'checkbox',
  }),

  AddCol({
@@ -974,6 +993,7 @@ export const colmySkills = [
    remote_key: '_id',
    remote_field: 'comune',
    required: true,
+    numpag_carousel: 2,
  }),
  AddCol({
    name: 'pub_to_share',
@@ -982,16 +1002,7 @@ export const colmySkills = [
    jointable: 'pub_to_share',
    icon: 'fas fa-users',
    showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView_OnlyifExist,
-  }),
-  AddCol({
-    name: 'adType',
-    label_trans: 'adTypes.name',
-    fieldtype: costanti.FieldType.select,
-    required: true,
-    jointable: 'adtypes',
-    showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit,
-    icon: 'fas fa-bullhorn',
-    noshowlabel: true,
+    numpag_carousel: 2,
  }),
  AddCol({
    name: 'descr',
@@ -1002,13 +1013,15 @@ export const colmySkills = [
    maxlength: 120,
    required: true,
    sortable: false,
+    numpag_carousel: 3,
  }),
  AddCol({
    name: 'note', label_trans: 'proj.descrapprof', fieldtype: costanti.FieldType.html,
    showWhen: costanti.showWhen.NewRec + costanti.showWhen.InEdit + costanti.showWhen.InView_OnlyifExist,
    titlepopupedit: 'Dettagli', field_extra1: 'username', subfield_extra1: '',
-    required: true,
+    required: false,
    isadvanced_field: true,
+    numpag_carousel: 3,
  }),
  AddCol({
    name: 'idSector',
@@ -1019,6 +1032,7 @@ export const colmySkills = [
    showWhen: costanti.showWhen.NewRec + costanti.showWhen.InEdit + costanti.showWhen.InView_OnlyifExist,
    visible: true,
    icon: 'category',
+    numpag_carousel: 4,
  }),
  AddCol({
    name: 'idSkill',
@@ -1033,6 +1047,7 @@ export const colmySkills = [
    showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView_OnlyifExist,
    allowNewValue: false,
    required: false,
+    numpag_carousel: 4,
  }),
  AddCol({
    name: 'idContribType',
@@ -1044,33 +1059,23 @@ export const colmySkills = [
    icon: 'fas fa-hand-holding',
    // icon: 'fas fa-hands-helping',
    // isadvanced_field: true,
+    numpag_carousel: 5,
  }),
  AddCol({
-    name: '',
-    fieldtype: costanti.FieldType.separator,
-    required: false,
-    showWhen: costanti.showWhen.NewRec + costanti.showWhen.InEdit,
-    visible: false,
-  }),
-
-
-  /*AddCol({
-    name: 'idSubSkill',
-    label_trans: 'skill.subskill',
-    fieldtype: costanti.FieldType.multiselect,
-    required: false,
-    jointable: 'subskills',
-    filter_table: 'skills',
-    filter_field: 'idSkill',
-    noshowlabel: true,
-    icon: 'far fa-id-card',
-    showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView_OnlyifExist,
-    allowNewValue: true,
+    name: 'photos',
+    label_trans: 'skill.photos',
+    fieldtype: costanti.FieldType.listimages,
+    jointable: '',
+    showpicprofile_ifnotset: true,
+    showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView,
    isadvanced_field: true,
+    numpag_carousel: 6,
+  }),
+  AddCol({
+    name: 'website', label_trans: 'reg.website', isadvanced_field: true, fieldtype: costanti.FieldType.link,
+    showWhen: costanti.showWhen.NewRec + costanti.showWhen.InEdit + costanti.showWhen.InView_OnlyifExist,
+    numpag_carousel: 6,
  }),
-
-   */
-
  AddCol({
    name: 'numLevel',
    label_trans: 'level.name',
@@ -1081,6 +1086,7 @@ export const colmySkills = [
    noshowlabel: false,
    icon: 'grading',
    isadvanced_field: true,
+    numpag_carousel: 7,
  }),
  AddCol({
    name: 'date_created', label_trans: 'event.dateCreated', fieldtype: costanti.FieldType.onlydate,
@@ -1089,20 +1095,7 @@ export const colmySkills = [
    sortable: true,
    showWhen: 0
  }),
-  AddCol({
-    name: 'photos',
-    label_trans: 'skill.photos',
-    fieldtype: costanti.FieldType.listimages,
-    jointable: '',
-    showpicprofile_ifnotset: true,
-    showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView,
-    isadvanced_field: true,
-  }),
  // **ADDFIELD_MYSKILL
-  AddCol({
-    name: 'website', label_trans: 'reg.website', isadvanced_field: true, fieldtype: costanti.FieldType.link,
-    showWhen: costanti.showWhen.NewRec + costanti.showWhen.InEdit + costanti.showWhen.InView_OnlyifExist
-  }),
  AddCol(DuplicateRec),
  AddCol(ModifRec),
  AddCol(DeleteRec),
@@ -1221,7 +1214,7 @@ export const colmyHosp = [
    showWhen: costanti.showWhen.NewRec + costanti.showWhen.InEdit + costanti.showWhen.InView_OnlyifExist,
    titlepopupedit: 'Dettagli', field_extra1: 'username', subfield_extra1: '',
    isadvanced_field: true,
-    required: true,
+    required: false,
    sortable: false,
  }),
  AddCol({
@@ -1339,7 +1332,7 @@ export const colmyBachecas = [
    name: 'note', label_trans: 'proj.descrapprof', fieldtype: costanti.FieldType.html,
    showWhen: costanti.showWhen.NewRec + costanti.showWhen.InEdit + costanti.showWhen.InView_OnlyifExist,
    titlepopupedit: 'Dettagli', field_extra1: 'username', subfield_extra1: '',
-    required: true,
+    required: false,
    isadvanced_field: true,
    sortable: false,
  }),
@@ -3062,6 +3055,13 @@ export const fieldsTable = {
    'myhosps',
  ],

+  tableforEnableCircuits: [
+    'myskills',
+    'mygoods',
+    'mybachecas',
+    'myhosps',
+  ],
+
  circuitslistcomplete() {
    return colTableCircuitComplete
  },
--- a/src/store/Modules/tools.ts
+++ b/src/store/Modules/tools.ts
@@ -6604,7 +6604,7 @@ export const tools = {
      _id: 0,
      idSector: tools.getSelectionByTable('sectors', 0, true),
      idSkill: tools.getSelectionByTable('skills', 0, true),
-      idStatusSkill: tools.getSelectionByTable('statusSkills', []),
+      idStatusSkill: tools.getSelectionByTable('statusSkills', [1]),
      idContribType: tools.getSelectionByTable('contribtypes', []),
      idCity: this.getCitySel(),
      NumLevel: 0,
@@ -6760,8 +6760,8 @@ export const tools = {
    const userStore = useUserStore()

    //if (tools.isTest() && (userStore.isAdmin || userStore.isManager))
-    if ((userStore.isAdmin || userStore.isManager))
-      return true
+    // if ((userStore.isAdmin || userStore.isManager))
+    //   return true

    if (shared_consts.TABLES_WITH_ADMINS.includes(tablesel)) {
      // is Admin ?