[us-commits] r2778 - in trunk: gui programs/us_com_project programs/us_convert programs/us_experiment sql
svn at svn.aucsolutions.com
svn at svn.aucsolutions.com
Wed May 29 01:35:57 MDT 2019
Author: alexey
Date: 2019-05-29 07:35:55 +0000 (Wed, 29 May 2019)
New Revision: 2778
Modified:
trunk/gui/us_select_item.cpp
trunk/gui/us_select_item.h
trunk/programs/us_com_project/us_com_project_gui.cpp
trunk/programs/us_convert/us_convert_gui.cpp
trunk/programs/us_convert/us_convert_gui.h
trunk/programs/us_experiment/us_experiment_gui_optima.cpp
trunk/sql/us3.sql
trunk/sql/us3_autoflow_procs.sql
Log:
autoflow:
* differentiate btw GMP & non-GMP runs (respectively, created with DA & us_comproject)
* if run was created with GMP program but attempting to reattach from NON-GMP program - read-only mode
* reattaching from GMP program is possible to all runs...
Modified: trunk/gui/us_select_item.cpp
===================================================================
--- trunk/gui/us_select_item.cpp 2019-05-29 04:26:14 UTC (rev 2777)
+++ trunk/gui/us_select_item.cpp 2019-05-29 07:35:55 UTC (rev 2778)
@@ -20,6 +20,7 @@
multi_sel = false;
deleted_button = false;
autoflow_button = false;
+ autoflow_da = false;
selxP = aselxP;
selxsP = NULL;
sort_ord = ( def_sort < 0 ) ? Qt::DescendingOrder
@@ -42,14 +43,20 @@
multi_sel = false;
deleted_button = false;
autoflow_button = false;
+ autoflow_da = false;
if ( !add_label.isEmpty() )
{
if ( add_label == "DELETE" )
deleted_button = true;
- if ( add_label == "AUTOFLOW" )
+ if ( add_label == "AUTOFLOW_GMP" )
autoflow_button = true;
+ if ( add_label == "AUTOFLOW_DA" )
+ {
+ autoflow_button = true;
+ autoflow_da = true;
+ }
}
selxP = aselxP;
@@ -281,10 +288,28 @@
// Set the column 0 name field
tw_data->setItem( kk, 0, new QTableWidgetItem( iname ) );
+
+ //ALEXEY: if GMP run ("YES") & open with DA software (autoflow_da == true), make item unselectable:
+ if ( autoflow_da && items[ ii ][ ncols -1 ] == "YES" )
+ {
+ tw_data->item( kk, 0)->setFlags(Qt::NoItemFlags);
+ // //tw_data->item( kk, 0)->setForeground(QBrush(QColor(250,0,0)));
+ tw_data->item( kk, 0)->setForeground(QBrush(Qt::gray));
+ }
+
for ( int jj = 1; jj < ncols; jj++ )
{ // Set fields for remaining columns of the present row
tw_data->setItem( kk, jj,
new QTableWidgetItem( items[ ii ][ jj ] ) );
+
+
+ //ALEXEY: if GMP run ("YES") & open with DA software (autoflow_da == true), make item unselectable:
+ if ( autoflow_da && items[ ii ][ ncols -1 ] == "YES" )
+ {
+ tw_data->item( kk, jj)->setFlags(Qt::NoItemFlags);
+ // //tw_data->item( kk, 0)->setForeground(QBrush(QColor(250,0,0)));
+ tw_data->item( kk, jj)->setForeground(QBrush(Qt::gray));
+ }
}
tw_data->setRowHeight( kk++, rowhgt );
Modified: trunk/gui/us_select_item.h
===================================================================
--- trunk/gui/us_select_item.h 2019-05-29 04:26:14 UTC (rev 2777)
+++ trunk/gui/us_select_item.h 2019-05-29 07:35:55 UTC (rev 2778)
@@ -64,6 +64,8 @@
bool multi_sel; //!< Flag: multiple selections enabled?
bool deleted_button; //If Delete button is present
bool autoflow_button; //If autoflow, Cancel becomes define another Experiment
+ bool autoflow_da; // If called by non-GMP us_comproject (DA)
+
Qt::SortOrder sort_ord; //!< Default sort order flag
int sort_col; //!< Default sort column
int nitems; //!< Number of items (rows)
Modified: trunk/programs/us_com_project/us_com_project_gui.cpp
===================================================================
--- trunk/programs/us_com_project/us_com_project_gui.cpp 2019-05-29 04:26:14 UTC (rev 2777)
+++ trunk/programs/us_com_project/us_com_project_gui.cpp 2019-05-29 07:35:55 UTC (rev 2778)
@@ -445,9 +445,15 @@
<< "Optima Name"
<< "Created"
<< "Run Status"
- << "Stage";
+ << "Stage"
+ << "GMP";
- QString autoflow_btn = "AUTOFLOW";
+ QString autoflow_btn;
+
+ if ( us_mode_bool )
+ autoflow_btn = "AUTOFLOW_DA";
+ else
+ autoflow_btn = "AUTOFLOW_GMP";
//US_SelectItem pdiag( autoflowdata, hdrs, pdtitle, &prx, autoflow_btn, -2 );
US_SelectItem* pdiag = new US_SelectItem( autoflowdata, hdrs, pdtitle, &prx, autoflow_btn, -2 );
@@ -502,6 +508,8 @@
QString expAborted = protocol_details[ "expAborted" ];
QString runID = protocol_details[ "runID" ];
QString exp_label = protocol_details[ "label" ];
+
+ QString gmp_Run = protocol_details[ "gmpRun" ];
QDir directory( currDir );
@@ -510,7 +518,8 @@
qDebug() << "1.CorrectRadii: " << protocol_details[ "correctRadii" ];
qDebug() << "Exp. Label: " << protocol_details[ "label" ];
-
+ qDebug() << "GMP Run ? " << protocol_details[ "gmpRun" ];
+
//ALEXEY: if stage=="EDITING" && curDir.isEmpty() (NULL)
/*
-- that means that Run Completed but Directory was created on different computer
@@ -731,6 +740,8 @@
QDateTime time_started = dbP->value( 11 ).toDateTime().toUTC();
QDateTime time_created = dbP->value( 13 ).toDateTime().toUTC();
+ QString gmpRun = dbP->value( 14 ).toString();
+
QDateTime local(QDateTime::currentDateTime());
autoflowentry << id << runname << optimaname << time_created.toString(); // << time_started.toString(); // << local.toString( Qt::ISODate );
@@ -746,7 +757,7 @@
//autoflowentry << time_started.toString();
}
- autoflowentry << status;
+ autoflowentry << status << gmpRun;
autoflowdata << autoflowentry;
nrecs++;
@@ -825,6 +836,8 @@
protocol_details[ "correctRadii" ] = db->value( 13 ).toString();
protocol_details[ "expAborted" ] = db->value( 14 ).toString();
protocol_details[ "label" ] = db->value( 15 ).toString();
+ protocol_details[ "gmpRun" ] = db->value( 16 ).toString();
+
}
}
Modified: trunk/programs/us_convert/us_convert_gui.cpp
===================================================================
--- trunk/programs/us_convert/us_convert_gui.cpp 2019-05-29 04:26:14 UTC (rev 2777)
+++ trunk/programs/us_convert/us_convert_gui.cpp 2019-05-29 07:35:55 UTC (rev 2778)
@@ -1025,6 +1025,106 @@
show_mwl_control( false );
}
+void US_ConvertGui::reset_auto( void )
+{
+ te_comment ->clear();
+
+ lw_triple ->clear();
+
+ le_dir ->setText( "" );
+
+ le_description ->setText( "" );
+ le_runID ->setText( "" );
+ le_runID2 ->setText( "" );
+ le_solutionDesc ->setText( "" );
+
+ pb_import ->setEnabled( true );
+ pb_loadUS3 ->setEnabled( true );
+ pb_exclude ->setEnabled( false );
+ pb_include ->setEnabled( false );
+ pb_showTmst ->setEnabled( false );
+ pb_details ->setEnabled( false );
+ pb_intensity ->setEnabled( false );
+ pb_cancelref ->setEnabled( false );
+ pb_dropTrips ->setEnabled( false );
+ pb_dropCelch ->setEnabled( false );
+ pb_dropChan ->setEnabled( false );
+ pb_solution ->setEnabled( false );
+ pb_editRuninfo->setEnabled( false );
+ pb_applyAll ->setEnabled( false );
+ pb_saveUS3 ->setEnabled( false );
+
+ ct_tolerance ->setEnabled( true );
+
+ cb_centerpiece->setEnabled( false );
+
+ ct_from ->disconnect();
+ ct_from ->setMinimum ( 0 );
+ ct_from ->setMaximum ( 0 );
+ ct_from ->setValue ( 0 );
+
+ ct_to ->disconnect();
+ ct_to ->setMinimum ( 0 );
+ ct_to ->setMaximum ( 0 );
+ ct_to ->setValue ( 0 );
+
+ // Clear any data structures
+ legacyData .clear();
+ allExcludes .clear();
+ all_tripinfo.clear();
+ all_chaninfo.clear();
+ all_triples .clear();
+ all_channels.clear();
+ out_tripinfo.clear();
+ out_chaninfo.clear();
+ out_triples .clear();
+ out_channels.clear();
+ allData .clear();
+ outData .clear();
+ ExpData .clear();
+ if ( isMwl )
+ mwl_data.clear();
+ show_plot_progress = true;
+
+ // Erase the todo list
+ lw_todoinfo->clear();
+ lw_todoinfo->addItem( "Load or import some AUC data" );
+
+ dataPlotClear( data_plot );
+ picker ->disconnect();
+ data_plot ->setAxisScale( QwtPlot::xBottom, 5.7, 7.3 );
+ data_plot ->setAxisScale( QwtPlot::yLeft , 0.0, 1.5 );
+ grid = us_grid( data_plot );
+ data_plot ->replot();
+
+ pb_define ->setEnabled( false );
+ pb_process ->setEnabled( false );
+ step = NONE;
+
+ enableRunIDControl( true );
+
+ toleranceChanged = false;
+ saveStatus = NOT_SAVED;
+ isPseudo = false;
+ isMwl = false;
+
+ pb_reference ->setEnabled( false );
+ referenceDefined = false;
+DbgLv(1) << "CGui: (1)referDef=" << referenceDefined;
+
+ // Display investigator
+ ExpData.invID = US_Settings::us_inv_ID();
+
+ QString number = ( ExpData.invID > 0 )
+ ? QString::number( ExpData.invID ) + ": "
+ : "";
+
+ le_investigator->setText( number + US_Settings::us_inv_name() );
+ show_mwl_control( false );
+}
+
+
+
void US_ConvertGui::resetAll( void )
{
QApplication::restoreOverrideCursor();
@@ -1079,7 +1179,7 @@
// if ( status != 0 ) return;
// }
- reset();
+ reset_auto();
le_status->setText( tr( "(no data loaded)" ) );
subsets.clear();
Modified: trunk/programs/us_convert/us_convert_gui.h
===================================================================
--- trunk/programs/us_convert/us_convert_gui.h 2019-05-29 04:26:14 UTC (rev 2777)
+++ trunk/programs/us_convert/us_convert_gui.h 2019-05-29 07:35:55 UTC (rev 2778)
@@ -251,6 +251,8 @@
US_Experiment ExpData; // Experiment data object
void reset ( void );
+ void reset_auto ( void );
+
void enableRunIDControl( bool );
void enableScanControls( void );
void enableSaveBtn ( void );
Modified: trunk/programs/us_experiment/us_experiment_gui_optima.cpp
===================================================================
--- trunk/programs/us_experiment/us_experiment_gui_optima.cpp 2019-05-29 04:26:14 UTC (rev 2777)
+++ trunk/programs/us_experiment/us_experiment_gui_optima.cpp 2019-05-29 07:35:55 UTC (rev 2778)
@@ -5374,6 +5374,7 @@
}
protocol_details[ "TripleNumber" ] = QString::number(nwavl_tot);
protocol_details[ "OptimaName" ] = rpRotor->instrname;
+ //protocol_details[ "OptimaName" ] = mainw->currentInstrument[ "name" ];
}
else
{
@@ -5417,6 +5418,14 @@
// Read Protocol details
void US_ExperGuiUpload::add_autoflow_record( QMap< QString, QString> & protocol_details )
{
+ QString gmpRun;
+ if ( mainw->usmode )
+ gmpRun = "NO";
+ else
+ gmpRun = "YES";
+
+ qDebug() << "GMPRUN FIELD: " << gmpRun;
+
// Check DB connection
US_Passwd pw;
QString masterpw = pw.getPasswd();
@@ -5441,7 +5450,8 @@
<< protocol_details[ "experimentId" ]
<< protocol_details[ "OptimaName" ]
<< protocol_details[ "invID_passed" ]
- << protocol_details[ "label" ];
+ << protocol_details[ "label" ]
+ << gmpRun;
db->query( qry );
}
Modified: trunk/sql/us3.sql
===================================================================
--- trunk/sql/us3.sql 2019-05-29 04:26:14 UTC (rev 2777)
+++ trunk/sql/us3.sql 2019-05-29 07:35:55 UTC (rev 2778)
@@ -33,7 +33,7 @@
activated TINYINT(1) NOT NULL DEFAULT false ,
signup TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ,
lastLogin DATETIME NULL ,
- clusterAuthorizations VARCHAR(255) NOT NULL default 'lonestar5:stampede2:comet:jetstream',
+ clusterAuthorizations VARCHAR(255) NOT NULL default 'lonestar5:stampede:comet:gordon:jetstream:demeler3-local',
userlevel TINYINT NOT NULL DEFAULT 0 ,
advancelevel TINYINT NOT NULL DEFAULT 0 ,
PRIMARY KEY (personID) )
@@ -80,35 +80,6 @@
ENGINE = InnoDB;
------------------------------------------------------
--- Table autoflow--
------------------------------------------------------
-
-DROP TABLE IF EXISTS autoflow;
-
-CREATE TABLE IF NOT EXISTS autoflow (
- ID int(11) NOT NULL AUTO_INCREMENT ,
- protName varchar(80) NULL,
- cellChNum int(10) NULL,
- tripleNum int(10) NULL,
- duration int(10) NULL,
- runName varchar(300) NULL,
- expID int(10) NULL,
- runID int(10) NULL,
- status enum('LIVE_UPDATE','EDITING','ANALYSIS','REPORT') NOT NULL,
- dataPath varchar(300) NULL,
- optimaName varchar(300) NULL,
- runStarted TIMESTAMP NULL,
- invID INT NULL,
- created TIMESTAMP NULL,
- corrRadii enum('YES', 'NO') NOT NULL,
- expAborted enum('NO', 'YES') NOT NULL,
- label varchar(80) NULL,
- PRIMARY KEY (ID) )
-ENGINE = InnoDB;
-
-
-
-- -----------------------------------------------------
-- Table instrument
-- -----------------------------------------------------
@@ -120,18 +91,6 @@
name TEXT NULL ,
serialNumber TEXT NULL ,
dateUpdated TIMESTAMP NULL ,
- radialCalID int(11) NOT NULL DEFAULT 0 ,
- optimaHost TEXT NULL ,
- optimaPort int(11) NULL ,
- optimaDBname TEXT NULL ,
- optimaDBusername TEXT NULL ,
- optimaDBpassw BLOB NULL ,
- chromaticAB TEXT NULL ,
- selected BOOL DEFAULT false ,
- opsys1 ENUM ('UV/visible', 'Rayleigh Interference', 'Fluorescense', '(not installed)') NOT NULL ,
- opsys2 ENUM ('UV/visible', 'Rayleigh Interference', 'Fluorescense', '(not installed)') NOT NULL ,
- opsys3 ENUM ('UV/visible', 'Rayleigh Interference', 'Fluorescense', '(not installed)') NOT NULL ,
- RadCalWvl int(11) NULL ,
PRIMARY KEY (instrumentID) ,
INDEX ndx_instrument_labID (labID ASC) ,
CONSTRAINT fk_instrument_labID
@@ -237,16 +196,14 @@
experimentGUID CHAR(36) NULL UNIQUE,
type ENUM('velocity', 'equilibrium', 'diffusion', 'buoyancy', 'calibration', 'other') NULL
DEFAULT 'velocity',
- runType ENUM('RA', 'RI', 'IP', 'FI', 'WA', 'WI', 'RI+IP', 'RI+FI', 'IP+FI', 'RI+IP+FI') NULL
- DEFAULT NULL,
+ runType ENUM( 'RA', 'RI', 'IP', 'FI', 'WA', 'WI' ) NULL DEFAULT NULL,
dateBegin DATE NOT NULL ,
runTemp FLOAT NULL ,
label VARCHAR(80) NULL ,
comment TEXT NULL ,
RIProfile LONGTEXT NULL ,
- protocolGUID CHAR(36) NULL ,
centrifugeProtocol TEXT NULL ,
- dateUpdated TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP ,
+ dateUpdated DATETIME NULL ,
PRIMARY KEY (experimentID) ,
INDEX ndx_experiment_projectID (projectID ASC) ,
INDEX ndx_experiment_operatorID (operatorID ASC) ,
@@ -310,27 +267,12 @@
canHoldSample INT NULL ,
materialRefURI TEXT NULL ,
centerpieceRefURI TEXT NULL ,
- dataUpdated TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP ,
+ dataUpdated TIMESTAMP NULL ,
PRIMARY KEY (abstractCenterpieceID) )
ENGINE = InnoDB;
-- -----------------------------------------------------
--- Table radialCalibration
--- -----------------------------------------------------
-DROP TABLE IF EXISTS radialCalibration ;
-
-CREATE TABLE IF NOT EXISTS radialCalibration (
- radialCalID int(11) NOT NULL AUTO_INCREMENT ,
- radialCalGUID char(36) NOT NULL UNIQUE ,
- speed int(11) NOT NULL DEFAULT 0 ,
- rotorCalID int(11) NOT NULL DEFAULT 0 ,
- dateUpdated TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP ,
- PRIMARY KEY (radialCalID) )
-ENGINE = InnoDB;
-
-
--- -----------------------------------------------------
-- Table cell
-- -----------------------------------------------------
DROP TABLE IF EXISTS cell ;
@@ -544,7 +486,7 @@
experimentID int(11) NOT NULL ,
solutionID int(11) NOT NULL ,
channelID int(11) NOT NULL ,
- lastUpdated TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP ,
+ lastUpdated DATETIME NULL ,
PRIMARY KEY (rawDataID) ,
INDEX ndx_rawData_experimentID (experimentID ASC) ,
INDEX ndx_rawData_channelID (channelID ASC) ,
@@ -572,13 +514,13 @@
CREATE TABLE IF NOT EXISTS editedData (
editedDataID int(11) NOT NULL AUTO_INCREMENT ,
- rawDataID int(11) NULL DEFAULT NULL ,
+ rawDataID int(11) NULL DEFAULT NULL,
editGUID CHAR(36) NOT NULL UNIQUE ,
- label VARCHAR(80) NOT NULL DEFAULT '' ,
- data LONGBLOB NULL ,
- filename VARCHAR(255) NOT NULL DEFAULT '' ,
+ label VARCHAR(80) NOT NULL DEFAULT '',
+ data LONGBLOB NOT NULL ,
+ filename VARCHAR(255) NOT NULL DEFAULT '',
comment TEXT NULL ,
- lastUpdated TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP ,
+ lastUpdated DATETIME NULL ,
PRIMARY KEY (editedDataID) ,
INDEX ndx_editedData_rawDataID (rawDataID ASC) ,
CONSTRAINT fk_editedData_rawDataID
@@ -914,7 +856,6 @@
submitTime datetime NOT NULL default '0000-00-00 00:00:00',
clusterName varchar(80) default NULL,
method enum('2DSA','2DSA_CG','2DSA_MW','GA','GA_MW','GA_SC','DMGA','PCSA') NOT NULL default '2DSA',
- analType text DEFAULT NULL ,
PRIMARY KEY (HPCAnalysisRequestID) )
ENGINE=InnoDB;
@@ -1792,7 +1733,7 @@
filename varchar(255) NOT NULL default '',
definitions longtext,
data longblob,
- lastUpdated TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP ,
+ lastUpdated TIMESTAMP NULL ,
PRIMARY KEY (timestateID) ,
CONSTRAINT fk_timestate_experimentID
FOREIGN KEY (experimentID)
@@ -1822,13 +1763,12 @@
solution1 varchar(80) NULL ,
solution2 varchar(80) NULL ,
wavelengths int(11) NULL ,
- aprofileGUID char(36) NULL ,
PRIMARY KEY (protocolID) )
ENGINE = InnoDB;
-- -----------------------------------------------------
--- Table protocolPerson
+-- Table prototcolPerson
-- -----------------------------------------------------
DROP TABLE IF EXISTS protocolPerson ;
@@ -1851,67 +1791,6 @@
-- -----------------------------------------------------
--- Table analysisprofile
--- -----------------------------------------------------
-DROP TABLE IF EXISTS analysisprofile ;
-
-CREATE TABLE IF NOT EXISTS analysisprofile (
- aprofileID int(11) NOT NULL AUTO_INCREMENT ,
- aprofileGUID char(36) NOT NULL UNIQUE ,
- name TEXT NOT NULL ,
- xml LONGTEXT NOT NULL ,
- dateUpdated TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP ,
- PRIMARY KEY (aprofileID) )
-ENGINE = InnoDB;
-
-
--- -----------------------------------------------------
--- Table protocolAprofile
--- -----------------------------------------------------
-DROP TABLE IF EXISTS protocolAprofile ;
-
-CREATE TABLE IF NOT EXISTS protocolAprofile (
- protocolID int(11) NOT NULL ,
- aprofileID int(11) NOT NULL ,
- INDEX ndx_protocolAprofile_aprofileID (aprofileID ASC) ,
- INDEX ndx_protocolAprofile_protocolID (protocolID ASC) ,
- CONSTRAINT fk_protocolAprofile_aprofileID
- FOREIGN KEY (aprofileID )
- REFERENCES analysisprofile (aprofileID )
- ON DELETE CASCADE
- ON UPDATE CASCADE,
- CONSTRAINT fk_protocolAprofile_protocolID
- FOREIGN KEY (protocolID )
- REFERENCES protocol (protocolID )
- ON DELETE NO ACTION
- ON UPDATE CASCADE)
-ENGINE = InnoDB;
-
-
--- -----------------------------------------------------
--- Table experimentProtocol
--- -----------------------------------------------------
-DROP TABLE IF EXISTS experimentProtocol ;
-
-CREATE TABLE IF NOT EXISTS experimentProtocol (
- experimentID int(11) NOT NULL ,
- protocolID int(11) NOT NULL ,
- INDEX ndx_experimentProtocol_protocolID (protocolID ASC) ,
- INDEX ndx_experimentProtocol_experimentID (experimentID ASC) ,
- CONSTRAINT fk_experimentProtocol_protocolID
- FOREIGN KEY (protocolID )
- REFERENCES protocol (protocolID )
- ON DELETE CASCADE
- ON UPDATE CASCADE,
- CONSTRAINT fk_experimentProtocol_experimentID
- FOREIGN KEY (experimentID )
- REFERENCES experiment (experimentID )
- ON DELETE NO ACTION
- ON UPDATE CASCADE)
-ENGINE = InnoDB;
-
-
--- -----------------------------------------------------
-- Table extinctionProfile
-- -----------------------------------------------------
DROP TABLE IF EXISTS extinctionProfile;
Modified: trunk/sql/us3_autoflow_procs.sql
===================================================================
--- trunk/sql/us3_autoflow_procs.sql 2019-05-29 04:26:14 UTC (rev 2777)
+++ trunk/sql/us3_autoflow_procs.sql 2019-05-29 07:35:55 UTC (rev 2778)
@@ -52,7 +52,8 @@
p_expid INT,
p_optimaname VARCHAR(80),
p_invID INT,
- p_label VARCHAR(80) )
+ p_label VARCHAR(80),
+ p_gmprun VARCHAR(80) )
MODIFIES SQL DATA
@@ -73,7 +74,8 @@
optimaName = p_optimaname,
invID = p_invID,
label = p_label,
- created = NOW();
+ created = NOW(),
+ gmpRun = p_gmprun;
SET @LAST_INSERT_ID = LAST_INSERT_ID();
@@ -84,6 +86,7 @@
END$$
+
-- DELETE autoflow record ( when Optima run aborted manually )
DROP PROCEDURE IF EXISTS delete_autoflow_record$$
CREATE PROCEDURE delete_autoflow_record ( p_personGUID CHAR(36),
@@ -153,7 +156,8 @@
SELECT @OK AS status;
SELECT protName, cellChNum, tripleNum, duration, runName, expID,
- runID, status, dataPath, optimaName, runStarted, invID, created, corrRadii, expAborted, label
+ runID, status, dataPath, optimaName, runStarted, invID, created,
+ corrRadii, expAborted, label, gmpRun
FROM autoflow
WHERE ID = p_autoflowID;
@@ -197,7 +201,7 @@
SELECT @OK AS status;
SELECT ID, protName, cellChNum, tripleNum, duration, runName, expID,
- runID, status, dataPath, optimaName, runStarted, invID, created, label
+ runID, status, dataPath, optimaName, runStarted, invID, created, gmpRun
FROM autoflow;
END IF;
More information about the us-commits
mailing list