add sample material column and rewrite inosticID column

qubittool/rowmodel.py

@@ -4,10 +4,7 @@ class RowModel:
         self.coordinate = coordinate
         self.accessionid = accessionid
         self.customerid = None
-<<<<<<< HEAD
         self.materialid = None
-=======
->>>>>>> d07459290f0590ab07c6c3fdca43ff95ec80057a
         self.plasmavolml = float(0.0)
         self.qubitrunid = None
         self.qubitassay = None

qubittool/tool.py

@@ -91,12 +91,8 @@ def write_run_doc(dm:dict, path:str):
     for r in dm:
         model:RowModel = dm[r]
         ix=ix+1
-<<<<<<< HEAD
         fmtId = formatInosticsId( model.get_Id(), model.get_materialid() )
         ws.append([ix, "", fmtId, model.get_customerid(), model.get_plasmavolml(), model.get_qubitrunid(), 
-=======
-        ws.append([ix, "", model.get_Id(), model.get_customerid(), model.get_plasmavolml(), model.get_qubitrunid(), 
->>>>>>> d07459290f0590ab07c6c3fdca43ff95ec80057a
         model.get_sampleconc(), convert_to_GE(model.get_sampleconc())])
 
     grayFill = PatternFill(start_color='D0CECE', end_color='D0CECE',