updated

src/api/current-history/content-types/current-history/schema.json

 {
 {
-  "kind": "singleType",
+  "kind": "collectionType",
   "collectionName": "current_histories",
   "collectionName": "current_histories",
   "info": {
   "info": {
     "singularName": "current-history",
     "singularName": "current-history",
     "pluralName": "current-histories",
     "pluralName": "current-histories",
-    "displayName": "Current history",
+    "displayName": "Assessments",
     "description": ""
     "description": ""
   },
   },
   "options": {
   "options": {
@@ -41,6 +41,48 @@
       "type": "component",
       "type": "component",
       "repeatable": false,
       "repeatable": false,
       "component": "ch-question3.ch-question3"
       "component": "ch-question3.ch-question3"
+    },
+    "fhQTitle": {
+      "type": "text"
+    },
+    "fhQ1": {
+      "displayName": "fhQ1",
+      "type": "component",
+      "repeatable": false,
+      "component": "fh-q1.fh-q1"
+    },
+    "fhQ2": {
+      "displayName": "fhQ2",
+      "type": "component",
+      "repeatable": false,
+      "component": "fh-q2.fh-q2"
+    },
+    "fhQ3": {
+      "displayName": "fhQ3",
+      "type": "component",
+      "repeatable": false,
+      "component": "fh-q3.fh-q3"
+    },
+    "uuid": {
+      "type": "string"
+    },
+    "tQ1": {
+      "displayName": "tQ1",
+      "type": "component",
+      "repeatable": false,
+      "component": "t-q1.t-q1"
+    },
+    "tQ2": {
+      "displayName": "tQ2",
+      "type": "component",
+      "repeatable": false,
+      "component": "t-q2.t-q2"
+    },
+    "tQ3": {
+      "displayName": "tQ3",
+      "type": "component",
+      "repeatable": false,
+      "component": "t-q3.t-q3"
     }
     }
   }
   }
 }
 }

src/api/family-history/content-types/family-history/schema.json

-{
-  "kind": "singleType",
-  "collectionName": "family_histories",
-  "info": {
-    "singularName": "family-history",
-    "pluralName": "family-histories",
-    "displayName": "Family history",
-    "description": ""
-  },
-  "options": {
-    "draftAndPublish": true
-  },
-  "pluginOptions": {},
-  "attributes": {
-    "title": {
-      "type": "string"
-    },
-    "fhQ1": {
-      "displayName": "fhQuestion1",
-      "type": "component",
-      "repeatable": false,
-      "component": "fh-question1.fh-question1"
-    },
-    "fhQ2": {
-      "displayName": "fhQ2",
-      "type": "component",
-      "repeatable": false,
-      "component": "fh-q2.fh-q2"
-    },
-    "fhQ3": {
-      "displayName": "fhQ3",
-      "type": "component",
-      "repeatable": false,
-      "component": "fh-q3.fh-q3"
-    }
-  }
-}

src/api/family-history/controllers/family-history.js

-'use strict';
-
-/**
- * family-history controller
- */
-
-const { createCoreController } = require('@strapi/strapi').factories;
-
-module.exports = createCoreController('api::family-history.family-history');

src/api/family-history/routes/family-history.js

-'use strict';
-
-/**
- * family-history router
- */
-
-const { createCoreRouter } = require('@strapi/strapi').factories;
-
-module.exports = createCoreRouter('api::family-history.family-history');

src/api/family-history/services/family-history.js

-'use strict';
-
-/**
- * family-history service
- */
-
-const { createCoreService } = require('@strapi/strapi').factories;
-
-module.exports = createCoreService('api::family-history.family-history');

src/api/trigger/content-types/trigger/schema.json

@@ -14,21 +14,6 @@
   "attributes": {
   "attributes": {
     "title": {
     "title": {
       "type": "string"
       "type": "string"
-    },
-    "question1": {
-      "type": "component",
-      "repeatable": true,
-      "component": "question2.question2"
-    },
-    "question2": {
-      "type": "component",
-      "repeatable": true,
-      "component": "question2.question2"
-    },
-    "question3": {
-      "type": "component",
-      "repeatable": true,
-      "component": "question2.question2"
     }
     }
   }
   }
 }
 }

src/components/fh-q1-options/fh-q1-options.json

@@ -6,7 +6,7 @@
   "options": {},
   "options": {},
   "attributes": {
   "attributes": {
     "text": {
     "text": {
-      "type": "string"
+      "type": "text"
     }
     }
   }
   }
 }
 }

src/components/fh-question1/fh-question1.json → src/components/fh-q1/fh-q1.json

 {
 {
-  "collectionName": "components_fh_question1_fh_question1s",
+  "collectionName": "components_fh_q1_fh_q1s",
   "info": {
   "info": {
-    "displayName": "fhQuestion1"
+    "displayName": "fhQ1"
   },
   },
   "options": {},
   "options": {},
   "attributes": {
   "attributes": {
     "fhQ1": {
     "fhQ1": {
-      "type": "string"
+      "type": "text"
     },
     },
     "fhQ1Options": {
     "fhQ1Options": {
       "displayName": "fhQ1Options",
       "displayName": "fhQ1Options",

src/components/fh-q2-options/fh-q2-options.json

@@ -6,7 +6,7 @@
   "options": {},
   "options": {},
   "attributes": {
   "attributes": {
     "text": {
     "text": {
-      "type": "string"
+      "type": "text"
     }
     }
   }
   }
 }
 }

src/components/fh-q2/fh-q2.json

 {
 {
   "collectionName": "components_fh_q2_fh_q2s",
   "collectionName": "components_fh_q2_fh_q2s",
   "info": {
   "info": {
-    "displayName": "fhQ2",
-    "description": ""
+    "displayName": "fhQ2"
   },
   },
   "options": {},
   "options": {},
   "attributes": {
   "attributes": {
     "fhQ2": {
     "fhQ2": {
-      "type": "string"
+      "type": "text"
     },
     },
     "fhQ2Options": {
     "fhQ2Options": {
       "displayName": "fhQ2Options",
       "displayName": "fhQ2Options",

src/components/fh-q3-options/fh-q3-options.json

@@ -6,7 +6,7 @@
   "options": {},
   "options": {},
   "attributes": {
   "attributes": {
     "text": {
     "text": {
-      "type": "string"
+      "type": "text"
     }
     }
   }
   }
 }
 }

src/components/fh-q3/fh-q3.json

 {
 {
   "collectionName": "components_fh_q3_fh_q3s",
   "collectionName": "components_fh_q3_fh_q3s",
   "info": {
   "info": {
-    "displayName": "fhQ3",
-    "description": ""
+    "displayName": "fhQ3"
   },
   },
   "options": {},
   "options": {},
   "attributes": {
   "attributes": {
     "fhQ3": {
     "fhQ3": {
-      "type": "string"
+      "type": "text"
     },
     },
     "fhQ3Options": {
     "fhQ3Options": {
       "displayName": "fhQ3Options",
       "displayName": "fhQ3Options",

src/components/t-q1/t-q1.json

+{
+  "collectionName": "components_t_q1_t_q1s",
+  "info": {
+    "displayName": "tQ1"
+  },
+  "options": {},
+  "attributes": {
+    "tQ1": {
+      "type": "text"
+    },
+    "tA1": {
+      "type": "text"
+    }
+  }
+}

src/components/t-q2/t-q2.json

+{
+  "collectionName": "components_t_q2_t_q2s",
+  "info": {
+    "displayName": "tQ2"
+  },
+  "options": {},
+  "attributes": {
+    "tQ2": {
+      "type": "text"
+    },
+    "tA2": {
+      "type": "text"
+    }
+  }
+}

src/components/t-q3/t-q3.json

+{
+  "collectionName": "components_t_q3_t_q3s",
+  "info": {
+    "displayName": "tQ3"
+  },
+  "options": {},
+  "attributes": {
+    "tQ3": {
+      "type": "text"
+    },
+    "tA3": {
+      "type": "text"
+    }
+  }
+}