@jd-data-limited/easy-fm 1.2.2-alpha6 → 1.3.1

package/dist/index.js

@@ -12,6 +12,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 // const fetch = (...args) => import('node-fetch').then(({default: fetch}) => fetch(...args));
 import fetch, { File, FormData } from 'node-fetch';
+import 'node-fetch';
 import { EventEmitter } from "events";
 // @ts-ignore
 import * as moment from "moment";
@@ -1182,7 +1183,7 @@ export class Database extends EventEmitter {
         });
     }
     getLayout(name) {
-        return new layout(this, name);
+        return new Layout(this, name);
     }
     setGlobals(globalFields) {
         // console.log({globalFields})
@@ -1196,7 +1197,7 @@ export class Database extends EventEmitter {
                     resolve();
                 }
                 else {
-                    reject(new FMError(res.messages[0].code, res.status, res));
+                    reject((res.messages[0].code, res.status, res));
                 }
             })
                 .catch(e => {
@@ -1211,9 +1212,9 @@ export class Database extends EventEmitter {
         this.emit("token_expired");
     }
 }
-class layout {
+export class Layout {
     constructor(database, name) {
-        this.records = new layoutRecordManager(this);
+        this.records = new LayourRecordManager(this);
         this.database = database;
         this.name = name;
     }
@@ -1275,7 +1276,7 @@ class layout {
         });
     }
 }
-class layoutRecordManager {
+class LayourRecordManager {
     constructor(layout) {
         this.layout = layout;
     }
@@ -1310,13 +1311,13 @@ class layoutRecordManager {
         });
     }
     range() {
-        return new recordGetRange(this.layout);
+        return new RecordGetRange(this.layout);
     }
     find() {
-        return new find(this.layout);
+        return new Find(this.layout);
     }
 }
-class RecordBase extends EventEmitter {
+export class RecordBase extends EventEmitter {
     constructor(layout, recordId, modId = recordId) {
         super();
         this.portals = [];
@@ -1332,7 +1333,7 @@ class RecordBase extends EventEmitter {
     }
     processPortalData(portalData) {
         for (let item of Object.keys(portalData)) {
-            let _portal = new portal(this, item);
+            let _portal = new Portal(this, item);
             _portal.records = portalData[item].map(item => {
                 let fieldData = item;
                 delete fieldData.recordId;
@@ -1344,7 +1345,7 @@ class RecordBase extends EventEmitter {
     }
     processFieldData(fieldData) {
         return Object.keys(fieldData).map(item => {
-            let _field = new field(this, item, fieldData[item]);
+            let _field = new Field(this, item, fieldData[item]);
             if (!!fieldData[item]) {
                 if (_field.metadata.result === "timeStamp") {
                     // @ts-ignore
@@ -1561,7 +1562,7 @@ class RecordBase extends EventEmitter {
         return obj;
     }
 }
-class LayoutRecord extends RecordBase {
+export class LayoutRecord extends RecordBase {
     constructor(layout, recordId, modId = recordId, fieldData = {}, portalData = null) {
         super(layout, recordId, modId);
         this.fields = this.processFieldData(fieldData);
@@ -1571,7 +1572,7 @@ class LayoutRecord extends RecordBase {
         }
     }
 }
-class field {
+export class Field {
     constructor(record, id, contents) {
         this.record = record;
         this.id = id;
@@ -1682,13 +1683,13 @@ class field {
         });
     }
 }
-class portal {
+export class Portal {
     constructor(record, name) {
         this.record = record;
         this.name = name;
     }
 }
-class PortalRecord extends RecordBase {
+export class PortalRecord extends RecordBase {
     constructor(record, portal, recordId, modId = recordId, fieldData = {}) {
         super(record.layout, recordId, modId);
         this.portal = portal;
@@ -1712,7 +1713,7 @@ class PortalRecord extends RecordBase {
         return res;
     }
 }
-class recordGetOperation {
+export class RecordGetOperation {
     constructor(layout) {
         this.limit = 100;
         this.limitPortals = [];
@@ -1752,11 +1753,11 @@ class recordGetOperation {
         return this;
     }
 }
-class recordGetRange extends recordGetOperation {
+export class RecordGetRange extends RecordGetOperation {
     constructor(layout) {
         super(layout);
     }
-    generateQueryParams() {
+    generateQueryParams(extraBody = {}) {
         let params = [];
         if (this.limit !== 100)
             params.push("_limit=" + this.limit);
@@ -1773,15 +1774,32 @@ class recordGetRange extends recordGetOperation {
                     params.push("_limit." + item.portal.name.replace(/[^0-9A-z]/g, "") + "=" + item.limit);
             }
         }
+        if (extraBody.scripts) {
+            if (extraBody.scripts.prerequest) {
+                params.push("script.prerequest=" + extraBody.scripts.prerequest.name);
+                if (extraBody.scripts.prerequest.param)
+                    params.push("script.prerequest.param=" + extraBody.scripts.prerequest.param);
+            }
+            if (extraBody.scripts.presort) {
+                params.push("script.presort=" + extraBody.scripts.presort.name);
+                if (extraBody.scripts.presort.param)
+                    params.push("script.presort.param=" + extraBody.scripts.presort.param);
+            }
+            if (extraBody.scripts.after) {
+                params.push("script=" + extraBody.scripts.after.name);
+                if (extraBody.scripts.after.param)
+                    params.push("script.param=" + extraBody.scripts.after.param);
+            }
+        }
         if (params.length === 0)
             return "";
         return "?" + params.join("&");
     }
-    run() {
+    run(extraBody = {}) {
         return new Promise((resolve, reject) => {
             // console.log(this.#toObject())
             this.layout.getLayoutMeta().then(() => {
-                return this.layout.database.apiRequest(`${this.layout.endpoint}/records${this.generateQueryParams()}`, {
+                return this.layout.database.apiRequest(`${this.layout.endpoint}/records${this.generateQueryParams(extraBody)}`, {
                     method: "GET"
                 });
             })
@@ -1806,7 +1824,7 @@ class recordGetRange extends recordGetOperation {
         });
     }
 }
-class find extends recordGetOperation {
+export class Find extends RecordGetOperation {
     constructor(layout) {
         super(layout);
         this.queries = [];

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@jd-data-limited/easy-fm",
-  "version": "1.2.2alpha6",
+  "version": "1.3.1",
   "dependencies": {
     "@types/btoa": "^1.2.3",
     "@types/events": "^3.0.0",
     "moment": "^2.29.4",
-    "node-fetch": "^3.3.0",
+    "node-fetch": "3.2.8",
     "typescript": "^4.9.4"
   },
   "type": "module",

package/prop1.toml

@@ -0,0 +1,58 @@
+#Minecraft server properties
+#Wed May 03 20:32:16 AEST 2023
+allow-flight=false
+allow-nether=true
+broadcast-console-to-ops=true
+broadcast-rcon-to-ops=true
+difficulty=easy
+enable-command-block=false
+enable-jmx-monitoring=false
+enable-query=false
+enable-rcon=false
+enable-status=true
+enforce-secure-profile=true
+enforce-whitelist=false
+entity-broadcast-range-percentage=100
+force-gamemode=false
+function-permission-level=2
+gamemode=survival
+generate-structures=true
+generator-settings={}
+hardcore=false
+hide-online-players=false
+level-name=world
+level-seed=
+level-type=minecraft\:normal
+max-chained-neighbor-updates=1000000
+max-players=20
+max-threads=6
+max-tick-time=-1
+max-world-size=29999984
+motd=A Minecraft Server
+network-compression-threshold=256
+online-mode=false
+op-permission-level=4
+player-idle-timeout=0
+prevent-proxy-connections=false
+previews-chat=false
+pvp=true
+query.port=25565
+rate-limit=0
+rcon.password=
+rcon.port=25575
+require-resource-pack=false
+resource-pack=
+resource-pack-prompt=
+resource-pack-sha1=
+server-ip=119.252.189.11
+server-port=27002
+simulation-distance=10
+spawn-animals=true
+spawn-monsters=true
+spawn-npcs=true
+spawn-protection=16
+sync-chunk-writes=false
+text-filtering-config=
+use-native-transport=true
+view-distance=10
+white-list=false

package/prop2.toml

@@ -0,0 +1,58 @@
+#Minecraft server properties
+#Wed May 03 12:46:20 CEST 2023
+allow-flight=false
+allow-nether=true
+broadcast-console-to-ops=true
+broadcast-rcon-to-ops=true
+difficulty=easy
+enable-command-block=true
+enable-jmx-monitoring=false
+enable-query=true
+enable-rcon=false
+enable-status=true
+enforce-secure-profile=true
+enforce-whitelist=false
+entity-broadcast-range-percentage=100
+force-gamemode=false
+function-permission-level=2
+gamemode=survival
+generate-structures=true
+generator-settings={}
+hardcore=false
+hide-online-players=false
+level-name=world
+level-seed=
+level-type=minecraft\:normal
+max-chained-neighbor-updates=1000000
+max-players=100
+max-tick-time=60000
+max-world-size=29999984
+motd=4vNBdJ
+network-compression-threshold=256
+online-mode=true
+op-permission-level=4
+player-idle-timeout=0
+prevent-proxy-connections=false
+previews-chat=false
+pvp=true
+query.port=41305
+rate-limit=0
+rcon.password=
+rcon.port=25575
+require-resource-pack=false
+resource-pack=
+resource-pack-prompt=
+resource-pack-sha1=
+server-ip=
+server-port=41305
+simulation-distance=10
+snooper-enabled=false
+spawn-animals=true
+spawn-monsters=true
+spawn-npcs=true
+spawn-protection=16
+sync-chunk-writes=true
+text-filtering-config=
+use-native-transport=true
+view-distance=10
+white-list=false

package/src/index.ts

@@ -58,11 +58,28 @@ interface loginOptionsClaris {
 }
 
 interface limitPortalsInterface {
-    portal: portal,
+    portal: Portal,
     offset: number,
     limit: number
 }
 
+interface extraBodyOptions {
+    scripts?: {
+        prerequest?: {
+            name: string,
+            param?: string
+        },
+        presort?: {
+            name: string,
+            param?: string
+        },
+        after?: {
+            name: string,
+            param?: string
+        },
+    }
+}
+
 // @ts-ignore
 const errs = [
     {
@@ -1290,8 +1307,8 @@ export class Database extends EventEmitter {
         return (data as any)
     }
 
-    getLayout(name): layout {
-        return new layout(this, name)
+    getLayout(name): Layout {
+        return new Layout(this, name)
     }
 
     setGlobals(globalFields): Promise<void> {
@@ -1305,7 +1322,8 @@ export class Database extends EventEmitter {
                 if (res.messages[0].code === "0") {
                     resolve()
                 } else {
-                    reject(new FMError(res.messages[0].code, res.status, res))
+                    reject(
+                        (res.messages[0].code, res.status, res))
                 }
             })
                 .catch(e => {
@@ -1323,9 +1341,9 @@ export class Database extends EventEmitter {
     }
 }
 
-class layout {
+export class Layout {
     readonly database: Database;
-    readonly records = new layoutRecordManager(this)
+    readonly records = new LayourRecordManager(this)
     protected name: string;
     metadata: any;
 
@@ -1355,7 +1373,7 @@ class layout {
     /**
      * @deprecated use layout.records.find() instead
      */
-    newFind(): find {
+    newFind(): Find {
         return this.records.find()
     }
 
@@ -1381,7 +1399,7 @@ class layout {
         })
     }
 
-    public getLayoutMeta(): Promise<layout | FMError> {
+    public getLayoutMeta(): Promise<Layout | FMError> {
         return new Promise((resolve, reject) => {
             if (this.metadata) {
                 resolve(this.metadata)
@@ -1397,10 +1415,10 @@ class layout {
     }
 }
 
-class layoutRecordManager {
-    readonly layout: layout
+class LayourRecordManager {
+    readonly layout: Layout
 
-    constructor(layout: layout) {
+    constructor(layout: Layout) {
         this.layout = layout
     }
 
@@ -1437,20 +1455,20 @@ class layoutRecordManager {
     }
 
     range() {
-        return new recordGetRange(this.layout)
+        return new RecordGetRange(this.layout)
     }
 
-    find(): find {
-        return new find(this.layout)
+    find(): Find {
+        return new Find(this.layout)
     }
 }
 
-class RecordBase extends EventEmitter {
-    readonly layout: layout;
+export class RecordBase extends EventEmitter {
+    readonly layout: Layout;
     public recordId: number;
     modId: number;
-    fields: field[];
-    portals: portal[] = [];
+    fields: Field[];
+    portals: Portal[] = [];
     protected portalData: any[];
 
     constructor(layout, recordId, modId = recordId) {
@@ -1470,7 +1488,7 @@ class RecordBase extends EventEmitter {
 
     protected processPortalData(portalData): void {
         for (let item of Object.keys(portalData)) {
-            let _portal = new portal(this, item)
+            let _portal = new Portal(this, item)
             _portal.records = portalData[item].map(item => {
                 let fieldData = item;
                 delete fieldData.recordId;
@@ -1481,9 +1499,9 @@ class RecordBase extends EventEmitter {
         }
     }
 
-    processFieldData(fieldData): field[] {
+    processFieldData(fieldData): Field[] {
         return Object.keys(fieldData).map(item => {
-            let _field = new field(this, item, fieldData[item])
+            let _field = new Field(this, item, fieldData[item])
             if (!!fieldData[item]) {
                 if (_field.metadata.result === "timeStamp") {
                     // @ts-ignore
@@ -1708,8 +1726,8 @@ class RecordBase extends EventEmitter {
         return obj
     }
 }
-class LayoutRecord extends RecordBase {
-    portals: portal[];
+export class LayoutRecord extends RecordBase {
+    portals: Portal[];
 
     constructor(layout, recordId, modId = recordId, fieldData = {}, portalData = null) {
         super(layout, recordId, modId);
@@ -1721,7 +1739,7 @@ class LayoutRecord extends RecordBase {
     }
 }
 
-class field {
+export class Field {
     record: RecordBase;
     id: number;
     private _value: string | number | Date;
@@ -1842,7 +1860,7 @@ class field {
     }
 }
 
-class portal {
+export class Portal {
     readonly record: RecordBase;
     readonly name: string;
     public records: PortalRecord[];
@@ -1853,8 +1871,8 @@ class portal {
     }
 }
 
-class PortalRecord extends RecordBase {
-    readonly portal: portal;
+export class PortalRecord extends RecordBase {
+    readonly portal: Portal;
 
     constructor(record, portal, recordId, modId = recordId, fieldData = {}) {
         super(record.layout, recordId, modId);
@@ -1883,8 +1901,8 @@ class PortalRecord extends RecordBase {
     }
 }
 
-class recordGetOperation {
-    protected layout: layout
+export class RecordGetOperation {
+    protected layout: Layout
     protected limit: number = 100
     protected scripts: object
     protected sort: object[]
@@ -1905,7 +1923,7 @@ class recordGetOperation {
     addToPortalLimit() will adjust the results of the get request so that if a layout has multiple portals in it,
     only data from the specified ones will be read. This may help reduce load on your FileMaker API
     */
-    addToPortalLimit(portal: portal, offset = 0, limit = 100) {
+    addToPortalLimit(portal: Portal, offset = 0, limit = 100) {
         if (offset < 0) throw "Portal offset cannot be less than 0"
         this.limitPortals.push({portal, offset, limit})
         return this
@@ -1929,12 +1947,12 @@ class recordGetOperation {
     }
 }
 
-class recordGetRange extends recordGetOperation {
+export class RecordGetRange extends RecordGetOperation {
     constructor(layout) {
         super(layout)
     }
 
-    private generateQueryParams() {
+    private generateQueryParams(extraBody: extraBodyOptions = {}) {
         let params = []
         if (this.limit !== 100) params.push("_limit=" + this.limit)
         if (this.offset !== 0) params.push("_offset=" + this.offset)
@@ -1946,16 +1964,30 @@ class recordGetRange extends recordGetOperation {
                 if (item.limit !== 100) params.push("_limit." + item.portal.name.replace(/[^0-9A-z]/g, "") + "=" + item.limit)
             }
         }
+        if (extraBody.scripts) {
+            if (extraBody.scripts.prerequest) {
+                params.push("script.prerequest=" + extraBody.scripts.prerequest.name)
+                if (extraBody.scripts.prerequest.param) params.push("script.prerequest.param=" + extraBody.scripts.prerequest.param)
+            }
+            if (extraBody.scripts.presort) {
+                params.push("script.presort=" + extraBody.scripts.presort.name)
+                if (extraBody.scripts.presort.param) params.push("script.presort.param=" + extraBody.scripts.presort.param)
+            }
+            if (extraBody.scripts.after) {
+                params.push("script=" + extraBody.scripts.after.name)
+                if (extraBody.scripts.after.param) params.push("script.param=" + extraBody.scripts.after.param)
+            }
+        }
 
         if (params.length === 0) return ""
         return "?" + params.join("&")
     }
 
-    run(): Promise<RecordBase[]> {
+    run(extraBody: extraBodyOptions = {}): Promise<RecordBase[]> {
         return new Promise((resolve, reject) => {
             // console.log(this.#toObject())
             this.layout.getLayoutMeta().then(() => {
-                return this.layout.database.apiRequest(`${this.layout.endpoint}/records${this.generateQueryParams()}`, {
+                return this.layout.database.apiRequest(`${this.layout.endpoint}/records${this.generateQueryParams(extraBody)}`, {
                     method: "GET"
                 })
             })
@@ -1979,7 +2011,7 @@ class recordGetRange extends recordGetOperation {
     }
 }
 
-class find extends recordGetOperation {
+export class Find extends RecordGetOperation {
     protected queries: object[]
 
     constructor(layout) {

package/test.js

@@ -1,16 +1,17 @@
 /*
  * Copyright (c) 2023. See LICENSE file for more information
  */
+process.env["NODE_TLS_REJECT_UNAUTHORIZED"] = 0;
 
-import FileMakerHost from "./src/index.ts";
+import FileMakerHost from "./dist/index.js";
 
 let host = new FileMakerHost("https://lab.farmmedix.com", 0, false)
 let database = host.database({
     database: "Snapshot_2",
     credentials: {
         method: "filemaker",
-        username: "jhawinkels",
-        password: "ZTw8&8E7"
+        username: "Developer",
+        password: "1df e53 0tx"
     },
     externalSources: []
 })
@@ -19,11 +20,13 @@ async function setup() {
     // console.log(await host.getMetadata())
     // console.log(host.timezoneOffset)
     await database.login()
-    let layout = database.getLayout("FarmsSync")
-    let record = await layout.records.create()
-    record.getField("MilkSuppliedTo").set("813A9BF4-70EC-8E41-A593-40F2AE56C600")
-    record.getField("MilkSupplierNumber").set("26319")
-    console.log(await record.commit())
+    let layout = database.getLayout("Archive")
+    layout.records.find()
+        .addRequests({"__PrimaryKey": "=BAB9264A-38A5-4C6F-8CEE-3788931EC269"})
+        .run()
+        .then(records => {
+            console.log(records[0].getField("Container").value)
+        })
     // await layout.getLayoutMeta()
     // console.log(layout.metadata)
     

package/test2.js

@@ -0,0 +1,413 @@
+const date = new Date();
+let [month, day, year] = [
+    date.getMonth() + 1,
+    date.getDate(),
+    date.getFullYear(),
+];
+
+if (day < 10) day = '0' + day;
+if (month < 10) month = '0' + month;
+
+console.log(window.location.href);
+var currloc = window.location.href.split('&fname=');
+var location_split = currloc[0].split('&location=');
+console.log(decodeURIComponent(location_split[1]).replace('&', '& '));
+
+var loc = location_split[0].replace('https://www.farmmedix.com/milk-sampling-consent/?location=', '');
+console.log(decodeURIComponent(loc));
+
+$('#date-today').html(day + '/' + month + '/' + year);
+$('#owner_name').html(decodeURIComponent(urlParam("fname")) + ' ' + decodeURI(urlParam("lname")));
+$('#farm-business-name').html('');
+$('#owner-phone').html('');
+$('#owner-email').html(decodeURIComponent(urlParam("email")))
+
+$("input[name=hidden_2]").val(day + '/' + month + '/' + year);
+$("input[name=hidden]").val(decodeURIComponent(urlParam("fname")));
+$("input[name=hidden_11]").val(decodeURIComponent(urlParam("lname")));
+$("input[name=hidden_1]").val(decodeURIComponent(urlParam("business_name")));
+$("input[name=hidden_4]").val(decodeURIComponent(urlParam("email")));
+$("input[name=hidden_3]").val(decodeURIComponent(urlParam("phone")));
+$("input[name=hidden_10]").val(decodeURIComponent(loc));
+$("input[name=hidden_12]").val(decodeURIComponent(urlParam("role")));
+$("input[name=show_staph]").val(decodeURIComponent(urlParam("show_staph")));
+
+$("input[name=show_staph]").trigger("change");
+
+
+var html = '<strong>Farm/Business Name</strong>: ' + decodeURI(urlParam("business_name"));
+html += '<br><strong>Location</strong>: ' + decodeURIComponent(loc);
+html += '<br><strong>First Name</strong>: ' + decodeURI(urlParam("fname"));
+html += '<br><strong>Last Name</strong>: ' + decodeURI(urlParam("lname"));
+html += '<br><strong>Email</strong>: ' + decodeURI(urlParam("email"));
+html += '<br><strong>Phone</strong>: ' + decodeURI(urlParam("phone"));
+html += '<br><strong>Role</strong>: ' + decodeURI(urlParam("role"));
+
+var allsuppliers = decodeURIComponent(urlParam("suppliers")).replace(' ', '').split(',');
+//console.log(decodeURIComponent(allsuppliers));
+
+var lis = '';
+var list_num = 13;
+var extralistnum = 1;
+var suppliers_all = '';
+var output = [];
+var newsupp = [];
+var suppliers_obj = {};
+
+var extra_html = '';
+
+$.each(allsuppliers, function( k, v ) {
+    //newsupp.push(v.split('-'));
+    var o = v.split('-');
+    suppliers_obj[o[0]] += decodeURIComponent(o[1]) + ', ';
+
+    extra_html += '<div style="width: 100%; display: inline-block; color: #000"><strong>'+v.replace('-', ' ')+'</strong></div><div style="width: 100%">';
+    extra_html += '<div><div style="float: left; margin-right: 10px;"><div class="ff-el-input--label ff-el-is-required asterisk-right"><label>Number of animals</label></div><input id="extra-list-animal" class="ff-el-form-control" required="" type="number" data-animal="'+extralistnum+'" aria-required="true" /></div>';
+    extra_html += '<div style="float: left; margin-right: 10px;"><div class="ff-el-input--label ff-el-is-required asterisk-right"><label>Number of Clinical Mastitis Cases</label></div><input id="extra-list-mastitis" class="ff-el-form-control" required="" type="number" data-mastitis="'+extralistnum+'" aria-required="true" /></div>';
+    extra_html += '<div style="float: left; margin-right: 10px;"><div class="ff-el-input--label ff-el-is-required asterisk-right"><label>Bulk tank SCC level</label></div><input id="extra-list-scc" class="ff-el-form-control" required="" type="number" data-scc="'+extralistnum+'" aria-required="true" /></div>';
+    extra_html += '<div style="float: left; margin-right: 10px;"><div class="ff-el-input--label"><label>Comment on SCC and Mastitis Cases</label></div><textarea id="extra-list-comment" class="ff-el-form-control" data-comment="'+extralistnum+'"></textarea></div>';
+    extra_html += '</div></div>';
+
+    extralistnum++;
+})
+
+$('#extra-fields').html(extra_html);
+
+$.each(suppliers_obj, function( i, v ) {
+//console.log(i, v)
+    //html += '<br><strong>Supplier '+(i+1)+'</strong>: ' + v.replace("-", " - ");
+    suppliers_all += '<span style="color: #000000;">- <b>'+ i + ' ' + v.replace('undefined', '').slice(0, -2) +'</b></span><br>';
+    $('input[name=hidden_'+list_num+']').val('- ' + i + ' ' + v.replace('undefined', '').slice(0, -2));
+    if(i != 'Fonterra'){
+        $('input[name="has_nonfonterra"').val('yes');
+    }
+    list_num++;
+    //extralistnum++;
+});
+
+$('#loc').html(decodeURIComponent(loc))
+$('#suppliers-all').html('');
+$('#total-samples').html('');
+$('#role').html($("input[name=hidden_4]").val());
+$('#user-full-name').html(decodeURIComponent(urlParam("fname")) + ' ' + decodeURIComponent(urlParam("lname")));
+
+$(document).on('change', '#extra-list-animal', function(){
+    var data_id = $(this).data('animal');
+    $('[name="num_animals_'+data_id+'"]').val($(this).val());
+});
+
+$(document).on('change', '#extra-list-mastitis', function(){
+    var data_id = $(this).data('mastitis');
+    $('[name="num_clinical_mastisis_'+data_id+'"]').val($(this).val());
+});
+
+$(document).on('change', '#extra-list-scc', function(){
+    var data_id = $(this).data('scc');
+    $('[name="bulk_tank_scc_'+data_id+'"]').val($(this).val());
+});
+
+$(document).on('change', '#extra-list-comment', function(){
+    var data_id = $(this).data('rolomment');
+    $('[name="comment_scc_'+data_id+'"]').val($(this).val());
+});
+
+//$("input[name=hidden_6]").val(allsuppliers.length);
+
+$('#preview').html(html)
+
+function urlParam(name) {
+    var results = (new RegExp("[\\?&]" + name + "=([^&#]*)")).exec(window.location.href);
+    if (results == null) return null;
+    else return results[1] || 0;
+};
+
+/*** added ***/
+
+var settings = {
+    "url": "https://snapshot-2-testenv-snpgtklz4a-ts.a.run.app/api/v2/farms/simple",
+    "method": "GET",
+    "timeout": 0,
+    "headers": {
+        "Authorization": "Bot L9lrcc3z+MqZFq2QWfiAuvNkbWyjisIA2BehMuLcw9Q=",
+        "Content-Type": "application/json",
+        "Cookie": "GAESA=CoQBMDAxMjE3ODliM2MyNzI0MDMzZTE1Yjk2OTFmOWRiNWNlODliMjhmMWU3YTI2ZjFmYTJiNGE5OGE0ZDBlMjQ1NDhkY2U5MWI5NGM2NzgxOTFmZjBjMTk5NDU4MTgwMTBjYjMwMzNiOWFlYTdkMjk5Zjc3ZDUyYjI4M2UzNjE3OWRmYzYyEMS59cD3MA"
+    },
+};
+
+var allSuppliers = [];
+var suppliersName = [];
+
+$.ajax(settings).done(function (response) {
+    //console.log(response);
+    var ff_11_dropdown_2_val = '';
+    //allSuppliers.push(response);
+    var voidSuppliers = ["TEST SUPPLIER", "UNKNOWN SUPPLIER", ""];
+    $.map(response, function(val) {
+        allSuppliers.push({supplier_name: val.supplierName, id: val.supplierNumber, name: val.bussinessName});
+        if($.inArray(val.supplierName, suppliersName) === -1) {
+            if($.inArray(val.supplierName, voidSuppliers) === -1){
+                suppliersName.push(val.supplierName);
+                ff_11_dropdown_2_val += '<option value="'+val.supplierName+'">'+val.supplierName+'</option>';
+            }
+        }
+    });
+
+    $('#ff_11_dropdown_2').html(ff_11_dropdown_2_val);
+});
+
+//console.log(allSuppliers);
+
+function urlParam(name) {
+    var results = (new RegExp("[\\?&]" + name + "=([^&#]*)")).exec(window.location.href);
+    if (results == null) return null;
+    else return results[1] || 0;
+};
+
+let location = decodeURI(urlParam("location"));
+let formnum = 1;
+
+$('.ff-el-form-check').eq(0).find('input').click();
+$('#ff_11_input_text').val(decodeURI(urlParam("farm_name")) === 'null' ? '' : decodeURI(urlParam("farm_name")));
+$('#ff_11_dropdown option[value="'+location+'"]').attr("selected","selected");
+$('#ff_11_names_first_name_').val(decodeURI(urlParam("fname")) === 'null' ? '' : decodeURI(urlParam("fname")));
+$('#ff_11_names_last_name_').val(decodeURI(urlParam("lname")) === 'null' ? '' : decodeURI(urlParam("lname")));
+$('#ff_11_email').val(decodeURI(urlParam("email")) === 'null' ? '' : decodeURI(urlParam("email")));
+
+$('#add-supplier').click(function(e){
+    e.preventDefault();
+    console.log('new supplier click');
+    formnum++;
+    var newfrm = '<div data-name="ff_cn_id_7" class="ff-t-container ff-column-container ff_columns_total_2 supplier_container"><div class="ff-t-cell ff-t-column-1" style="flex-basis: 50%;"><div class="ff-el-group"><div class="ff-el-input--label ff-el-is-required asterisk-right"><label for="ff_11_dropdown_2" aria-label="Supplier Name 1">Supplier Name '+formnum+'</label> </div><div class="ff-el-input--content"><select name="dropdown_2" id="ff_11_dropdown_2" class="ff-el-form-control" data-name="dropdown_2" data-calc_value="0" aria-invalid="false" aria-required="true"><option value="">– Select Supplier '+ formnum +' –</option><option value="Fonterra">Fonterra</option><option value="Arrabawn">Arrabawn</option><option value="Aurivo">Aurivo</option><option value="Carbery">Carbery</option><option value="Dairy Goat Coop">Dairy Goat Coop</option><option value="Dairygold">Dairygold</option><option value="Green Valley Dairies">Green Valley Dairies</option><option value="Mataura Valley Milk">Mataura Valley Milk</option><option value="Maui">Maui</option><option value="Miraka">Miraka</option><option value="Open Country">Open Country</option><option value="Organic Dairy Hub">Organic Dairy Hub</option><option value="Synlait">Synlait</option><option value="Tatua">Tatua</option><option value="Waiau">Waiau</option><option value="Westland">Westland</option></select></div></div></div><div class="ff-t-cell ff-t-column-2" style="flex-basis: 50%;"><div class="ff-el-group"><div class="ff-el-input--label ff-el-is-required asterisk-right"><label for="ff_11_numeric-field" aria-label="Supplier Number 1">Supplier Number '+formnum+'</label> <span id="remove-supplier">x remove</span></div><div class="ff-el-input--content"><input type="number" name="numeric-field" id="ff_11_numeric-field" class="ff-el-form-control" data-name="numeric-field" inputmode="numeric" step="any" aria-invalid="false" aria-required="true"><div id="res_dropdown"></div></div></div></div></div>';
+    if (decodeURIComponent(urlParam("show_staph")) !== "true") newfrm += "<div style='display:none;'>"
+    newfrm += '<div data-name="ff_cn_id_6" class="ff-t-container ff-column-container ff_columns_total_4 div4 "><div class="ff-t-cell ff-t-column-1" style="flex-basis: 25%;"><div class="ff-el-group"><div class="ff-el-input--label ff-el-is-required asterisk-right"><label for="number_of_animals_'+formnum+'" aria-label="Number of Animals">Number of Animals</label> </div><div class="ff-el-input--content"><input data-name="num_animals_'+formnum+'" type="number" name="number_of_animals_'+formnum+'" id="extra" class="ff-el-form-control" inputmode="numeric" step="any" aria-invalid="false" aria-required="true"><div id="res_dropdown2"></div></div></div></div><div class="ff-t-cell ff-t-column-2" style="flex-basis: 25%;"><div class="ff-el-group"><div class="ff-el-input--label ff-el-is-required asterisk-right"><label for="number_of_clinicalmastisis_'+formnum+'" aria-label="Number of Clinical Mastitis Cases">Number of Clinical Mastitis Cases</label> </div><div class="ff-el-input--content"><input type="number" name="number_of_clinicalmastisis_'+formnum+'" id="extra" class="ff-el-form-control" data-name="num_clinical_mastisis_'+formnum+'" inputmode="numeric" step="any" aria-invalid="false" aria-required="true"></div></div></div><div class="ff-t-cell ff-t-column-3" style="flex-basis: 25%;"><div class="ff-el-group"><div class="ff-el-input--label ff-el-is-required asterisk-right"><label for="bulk_tank_level'+formnum+'" aria-label="Bulk tank SCC level">Bulk tank SCC level</label> </div><div class="ff-el-input--content"><input type="number" name="bulk_tank_level'+formnum+'" id="extra" class="ff-el-form-control" data-name="bulk_tank_scc_'+formnum+'" inputmode="numeric" step="any" aria-invalid="false" aria-required="true"></div></div></div><div class="ff-t-cell ff-t-column-4" style="flex-basis: 25%;"><div class="ff-el-group"><div class="ff-el-input--label asterisk-right"><label for="comment_scc_mastisis'+formnum+'" aria-label="Comment on SCC and Mastitis Cases">Comment on SCC and Mastitis Cases</label> </div><div class="ff-el-input--content"><textarea aria-invalid="false" aria-required="false" name="comment_scc_mastisis'+formnum+'" id="extra" class="ff-el-form-control" rows="3" cols="2" data-name="comment_scc_'+formnum+'"></textarea></div></div></div></div>';
+    if (decodeURIComponent(urlParam("show_staph")) !== "true") newfrm += "</div>"
+
+    $('.div4:last').after('<div class="newdiv" id="form-container-'+formnum+'"></div>');
+
+    //$(this).prepend(newfrm)
+    $(document).find("#form-container-"+formnum).html(newfrm);
+});
+
+$(document).on('click', '#remove-supplier', function(){
+    var p = $(this).parent().parent().parent().parent().parent();
+    formnum -= 1;
+    p.remove();
+    console.log(p);
+    fill_suppliers();
+});
+
+//disabled
+$(document).on('click', '#ff_11_numeric-field_disabled', function(){
+    var supplier_name = $(this).parent().parent().parent().parent().find('#ff_11_dropdown_2').val();
+    var result = [];
+    var res = '';
+    var el = $(this);
+    if(supplier_name !== ''){
+        console.log('here' + supplier_name);
+
+        $.map(allSuppliers, function(val) {
+            console.log(val.supplier_name);
+            if(supplier_name == val.supplier_name){
+                result.push({id: val.id, milk_supplier: val.name});
+            }
+
+        });
+
+        $.map(result, function(value) {
+            console.log(value)
+            res += '<div id="milk-supplier" data-id="'+value.id+'">'+value.id+'-'+value.milk_supplier+'</div>';
+        });
+
+        console.log(result);
+
+
+        el.next('#res_dropdown').html(res).css('display', 'block');
+
+
+    }
+
+});
+$('#ff_11_numeric-field').after('<div id="res_dropdown"></div>');
+
+var result = {};
+var result2 = {};
+var allsuppliers = [];
+
+function fill_suppliers(){
+    let suppliers_arr = [];
+    let supplier_arr2 = [{}];
+    $(".supplier_container").each(function() {
+        var supplier = $(this).find('#ff_11_dropdown_2').val();
+        var supplier_id = $(this).find('#ff_11_numeric-field').val();
+        suppliers_arr.push(supplier+'-'+supplier_id);
+        supplier_arr2.push({supplier: supplier, supplier_id: supplier_id});
+    });
+    allsuppliers = [];
+    allsuppliers.push([suppliers_arr]);
+    $('#total-samples').html(suppliers_arr.length);
+    $('[name="hidden_6"]').val(suppliers_arr.length);
+
+    //console.log(supplier_arr2)
+    grouped = [];
+
+    supplier_arr2.forEach(function (hash) {
+        return function (o) {
+            if (!hash[o.supplier]) {
+                hash[o.supplier] = { supplier: o.supplier, supplier_id: '' };
+                grouped.push(hash[o.supplier]);
+            }
+            if(o.supplier !== undefined){
+                hash[o.supplier].supplier_id += o.supplier_id + '|';
+            }
+
+        };
+    }(Object.create(null)));
+
+    var grouped_suppliers = '';
+    $('#suppliers-all').html('');
+//console.log('grouped')
+    let groupnum = 13;
+    grouped.forEach(function (item, index) {
+        //console.log(item.supplier);
+        if(item.supplier !== undefined){
+            grouped_suppliers += '- ' + item.supplier + ' ' + item.supplier_id.substring(0, item.supplier_id.length-1).replace('|', ', ') + '\r\n<br>';
+            $('[name="hidden_'+groupnum+'"]').val(' - ' + item.supplier + ' ' + item.supplier_id.substring(0, item.supplier_id.length-1).replace('|', ', '));
+            groupnum++;
+        }
+
+    });
+
+    //console.log(grouped_suppliers);
+    $('#suppliers-all').html(grouped_suppliers);
+    //$('[name="hidden_suppliers"]').val(allsuppliers);
+    //$('[name="suppliers_field"]').val(grouped_suppliers);
+}
+
+$(document).on('blur', '#ff_11_numeric-field', function(){
+    fill_suppliers();
+    //console.log(allsuppliers)
+    $('[id=res_dropdown]').slideUp();
+});
+
+$(document).on('keyup', '#ff_11_numeric-field_disabled', function(){
+    res = '';
+    var i = $(this).val();
+    var supplier_name = $(this).parent().parent().parent().parent().find('#ff_11_dropdown_2').val();
+    result = [];
+    $.map(suppliers_json[supplier_name], function(val) {
+        result.push(val);
+    });
+
+    $.map(result, function(value) {
+
+        if(i != ''){
+            var varid = value.id;
+            var regex = new RegExp(this.value);
+            res += varid.includes(i) ? '<div id="milk-supplier" data-id="'+value.id+'">'+value.id+'-'+value.milk_supplier+'</div>' : "";
+        }
+    });
+
+    if(i !== ''){
+        $(this).next('#res_dropdown').show();
+        $(this).next('#res_dropdown').html(res);
+    }else{
+        $(this).next('#res_dropdown').hide();
+    }
+
+    res = '';
+});
+
+$(document).on('click', '#milk-supplier', function(){
+    console.log('supplier' + $(this).data('id'));
+    $(this).parent().parent().find('#ff_11_numeric-field').val($(this).data('id'));
+    $(this).parent().parent().find('#ff_11_numeric-field').focus();
+    $('[id=res_dropdown]').slideUp();
+})
+
+$('#ff_11_numeric-field_1').after('<div id="res_dropdown2"></div>');
+
+$("#ff_11_dropdown_3").change(function(){
+    result2 = [];
+    $.map(suppliers_json[this.value], function(val) {
+        result2.push(val);
+    });
+    console.log(result2);
+    console.log(result2);
+});
+
+var all_suppliers = {};
+
+$('#ff_11_numeric-field_1').on('keyup', function(){
+    res2 = '';
+    var i = $(this).val();
+    $.map(result2, function(value) {
+        //res += val.id +'-'+ val.milk_supplier + '\r\n';
+        //console.log(1);
+        if(i !== ''){
+            var varid = value.id;
+            var regex = new RegExp(this.value);
+            //console.log(varid);
+            //console.log(this.value);
+
+            res2 += varid.includes(i) ? '<div>'+value.id+'-'+value.milk_supplier+'</div>' : "";
+            $('#res_dropdown2').css('display', 'block');
+
+            var last_supplier = $(this).prev('#ff_11_dropdown_2').val();
+            //console.log(last_supplier);
+        }
+
+
+    });
+    if(i !== ''){
+        $('#res_dropdown2').html(res2);
+    }else{
+        $('#res_dropdown2').css('display', 'none');
+    }
+
+    res = ''
+});
+
+$('#ff_11_dropdown_2').change(function(){
+    $('#ff_11_numeric-field').val('');
+});
+
+$('#ff_11_phone_1').on('keyup', function(){
+    $('#owner-phone').html($(this).val());
+    $("input[name=hidden_3]").val($(this).val());
+});
+
+$('#ff_11_input_text').on('keyup', function(){
+    $('#farm-business-name').html($(this).val());
+    $("input[name=hidden_1]").val($(this).val());
+});
+
+// $('#ff_11_dropdown_1').change(function(){
+//     $('#role').html($(this).val());
+//     $("input[name=hidden_12]").val($(this).val());
+// });
+
+$(document).on('change', '#extra', function(){
+    var name = $(this).data('name');
+    var value = $(this).val();
+    console.log(name, value);
+    $('input[name="'+name+'"]').val(value);
+});
+
+$('#ff_11_number_of_animals_1').change(function(){
+    var value = $(this).val();
+    $('input[name="num_animals_1"]').val(value);
+});
+$('#ff_11_number_of_clinicalmastisis_1').change(function(){
+    var value = $(this).val();
+    $('input[name="num_clinical_mastisis_1"]').val(value);
+});
+$('#ff_11_bulk_tank_level2').change(function(){
+    var value = $(this).val();
+    $('input[name="bulk_tank_scc_1"]').val(value);
+});
+$('#ff_11_comment_scc_mastisis2').change(function(){
+    var value = $(this).val();
+    $('input[name="comment_scc_1"]').val(value);
+});
+
+