Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

OOD added job_name #241

Merged
merged 2 commits into from
Jun 30, 2020
Merged

OOD added job_name #241

merged 2 commits into from
Jun 30, 2020

Conversation

plessbd
Copy link
Contributor

@plessbd plessbd commented Jun 29, 2020

Open OnDemand asked for the ability to show job_name this adds it. This was originally in 8.7 this brings it in to 9.0.

@plessbd plessbd added the OpenOnDemand Specific changes for OpenOnDemand Integration label Jun 29, 2020
Comment on lines 68 to 79
$this->addTable( $joblistTable );
$this->addTable( $factTable );

// This is used by Integrations and not currently shown on the XDMoD interface
$jobnameTable = new Table(new Schema('modw_supremm'), "job_name", "jn" );
$this->addWhereCondition(new WhereCondition(new TableField($factTable, "jobname_id"), '=', new TableField($jobnameTable, "id") ));
$this->addField(new TableField($jobnameTable, 'name', 'job_name'));
$this->addTable($jobnameTable );

$this->addWhereCondition(new WhereCondition( new TableField($joblistTable, "agg_id"), "=",
new TableField($dataTable, "id") ));
$this->addWhereCondition(new WhereCondition( new TableField($joblistTable, "jobid"), "=",
Copy link
Contributor

@jtpalmer jtpalmer Jun 30, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can these additions safely be moved to below the joins? Right now it's between where the job list and fact tables are added and then joined. The file already has some odd structure, but I think it would be best to keep the existing logically related code together.

@jtpalmer
Copy link
Contributor

@plessbd plessbd merged commit ae1210e into ubccr:xdmod9.0 Jun 30, 2020
@plessbd plessbd deleted the 87to90 branch June 30, 2020 15:33
plessbd added a commit to plessbd/xdmod-supremm that referenced this pull request Jul 20, 2020
@jpwhite4 jpwhite4 added this to the 9.0.0 milestone Aug 11, 2020
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
OpenOnDemand Specific changes for OpenOnDemand Integration
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants