Fixing fields

Author: perki

common-data-defs.js

@@ -1,19 +1,26 @@
 
 const patientBaseStreams = [
   // profile
+  {id: 'profile', name: 'Profile'},
   {id: 'profile-name', name: 'Name', parentId: 'profile'},
   {id: 'profile-nationality', name: 'Nationality', parentId: 'profile'},
   {id: 'profile-date-of-birth', name: 'Date of Birth', parentId: 'profile'},
   {id: 'profile-location', name: 'Location', parentId: 'profile'},
   {id: 'profile-sex', name: 'Sex', parentId: 'profile'},
   // family
+  {id: 'family', name: 'Family'},
   {id: 'family-children', name: 'Children', parentId: 'family'},
   // fertility
+  {id: 'fertility', name: 'Fertility'},
   {id: 'fertility-miscarriages', name: 'Miscarriages', parentId: 'fertility'},
   {id: 'fertility-traings', name: 'Trainings', parentId: 'fertility'},
   {id: 'fertility-cycles', name: 'Cycles', parentId: 'fertility'},
   {id: 'fertility-cycles-charted-extimation', name: 'Cycles charted estimation', parentId: 'fertility'},
   {id: 'fertility-ttc-tta', name: 'Trying to conceive / Avoiding pregnancy', parentId: 'fertility'},
+  // body
+  {id: 'body', name: 'Body'},
+  {id: 'body-height', name: 'Body Height', parentId: 'body'},
+  {id: 'body-weight', name: 'Body Weight', parentId: 'body'},
 ];
 
 const patientBasePermissions = [

dr-lib.js

@@ -136,7 +136,7 @@ async function getPatientDetails (patientEvent) {
   const profileEvents = await patientConnection.api([{ method: 'events.get', params: { limit: 100 } }]);
   for (const profileEvent of profileEvents[0].events) {
     const field = dataFieldFromEvent(profileEvent);
-    if (field) {
+    if (field && patient.formData[field.key] == null) { // drop historical values 
       patient.formData[field.key] = field;
     }
   }

patient-home-lib.js

@@ -112,6 +112,10 @@ async function grantAccess (formInfo, formDetails) {
 }
 
 async function publishAccess (formInfo, apiEndpoint) {
+  // create needed base streams
+  const baseStreams = dataDefs.questionnaires[formInfo.questionaryId].patientBaseStreams;
+  await createsPatientAccountStreams(connection, baseStreams);
+
   // publishing access on Dr Account
   const apiCalls = [{
     method: 'events.create',
@@ -180,12 +184,6 @@ function getPatientApiEndpoint() {
 }
 
 function showLoginButton (loginSpanId, stateChangeCallBack) {
-
-  // const requestedPermissions = dataDefs.patientBasePermissions.map(perm => ({
-  //   streamId: perm.id,
-  //   defaultName: perm.name,
-  //   level: 'manage'
-  // }));
 
    const requestedPermissions = [{
      streamId: '*',

patient-profile-controler.js

@@ -6,7 +6,7 @@
  */
 
 window.onload = async (event) => {
-  const { patientApiEndpoint, questionaryId } = getPatientApiEndpoint();
+  const { patientApiEndpoint, questionaryId } = getPatientApiEndpointAndFormId();
   console.log('## patientApiEndpoint:', patientApiEndpoint);
   await connect(patientApiEndpoint, questionaryId);
   updateFormContent('profile');
@@ -17,7 +17,7 @@ window.onload = async (event) => {
 
 
 // ------- Get Dr's info -------- //
-function getPatientApiEndpoint() {
+function getPatientApiEndpointAndFormId() {
   const params = new URLSearchParams(document.location.search);
   const patientApiEndpoint = params.get('patientApiEndpoint');
   const questionaryId = params.get('questionaryId');

patient.html

@@ -82,8 +82,10 @@ <h3>Permission request</h3>
           <br>
 
           <br>
-          <h3>JSON detail</h3>
-          <span id="card-questionnary-details-content"></span>
+          <!--
+            <h3>JSON detail</h3>
+            <span id="card-questionnary-details-content"></span>
+          -->
         </div>
       </div>
     </div>