Skip to content

Commit

Permalink
[BACKLOG-6046] Revamp the Job/Trans run dialogs
Browse files Browse the repository at this point in the history
  • Loading branch information
e-cuellar authored and mdamour1976 committed Jan 29, 2016
1 parent cb098fd commit d648b45
Show file tree
Hide file tree
Showing 60 changed files with 1,433 additions and 1,073 deletions.
2 changes: 1 addition & 1 deletion assembly/package-res/ui/menubar.xul
Expand Up @@ -112,7 +112,7 @@
<menuitem id="process-run" acceltext="F9" accesskey="f9" label="${Spoon.Menu.Transformation.Run}"
command="spoon.runFile()" />
<menuitem id="process-run-options" acceltext="F8" accesskey="f8" label="${Spoon.Menu.Transformation.RunOptions}"
command="" /> <!-- must add command after implemented -->
command="spoon.runOptionsFile()" />
<menuitem id="trans-preview" acceltext="F10" accesskey="f10" label="${Spoon.Menu.Transformation.Preview}"
command="spoon.previewFile()" />
<menuitem id="trans-debug" acceltext="SHIFT-F10" accesskey="shift-f10" label="${Spoon.Menu.Transformation.Debug}"
Expand Down
Expand Up @@ -67,7 +67,7 @@ TransLogTable.FieldDescription.BatchID=The batch ID. It''s a unique number, incr
PerformanceLogTable.FieldDescription.LinesInput=The number of lines read from input (file, database, network, ...) during the interval
CheckpointLogTable.Type.Description=The Checkpoint log table
StepLogTable.FieldName.LogDate=Log date
LogWriter.Level.Nothing.LongDesc=Nothing at all
LogWriter.Level.Nothing.LongDesc=Nothing
ChannelLogTable.FieldName.ObjectId=ID
PerformanceLogTable.FieldName.SeqNr=Nr
MetricsLogTable.FieldName.ChannelId=Channel ID
Expand Down Expand Up @@ -119,7 +119,7 @@ MetricsLogTable.FieldDescription.MetricsSubject=The subject that is being measur
StepLogTable.FieldDescription.ObjectCopy=The object (step) copy number
JobLogTable.FieldDescription.StartingJobEntry=The name of the job entry where this job started
JobEntryLogTable.FieldDescription.Errors=Errors
LogWriter.Level.Detailed.LongDesc=Detailed logging
LogWriter.Level.Detailed.LongDesc=Detailed
TransLogTable.FieldName.EndDateRange=Date range end
JobLogTable.FieldDescription.LinesWritten=The number of lines writtenby the last job entry (transformation).
PerformanceLogTable.Type.Description=Step performance log table
Expand All @@ -139,7 +139,7 @@ JobEntryLogTable.FieldName.LogField=Log field
CheckpointLogTable.FieldName.JobID=Job ID
PerformanceLogTable.FieldName.LinesRejected=Rejected
TransLogTable.FieldDescription.PID=The process identifier (PID) for job execution
LogWriter.Level.Debug.LongDesc=Debugging
LogWriter.Level.Debug.LongDesc=Debug
JobLogTable.FieldDescription.ExecutingServer=The server that executed this job
MetricsLogTable.FieldName.MetricsType=Metric type
JobEntryLogTable.FieldName.PID=PID
Expand Down Expand Up @@ -168,7 +168,7 @@ JobEntryLogTable.FieldName.JobEntryName=Job entry name
JobLogTable.FieldDescription.HostName=Name of server hosting job execution
StepLogTable.Type.Description=Step log table
PerformanceLogTable.FieldName.OutputBufferRows=Output buffer
LogWriter.Level.Minimal.LongDesc=Minimal logging
LogWriter.Level.Minimal.LongDesc=Minimal
JobLogTable.FieldName.ExecutingServer=Executing server
ChannelLogTable.Type.Description=Logging channel log table
JobLogTable.FieldDescription.LinesOutput=The number of lines written to disk or the network by the last job entry (transformation). This is input to files, databases, etc.
Expand All @@ -194,7 +194,7 @@ TransLogTable.FieldName.LinesWritten=Written
ChannelLogTable.FieldName.ObjectName=Name
TransLogTable.FieldDescription.StartDateRange=The start of the date range for incremental (CDC) data processing. It''s the ''end of date range'' of the last time this transformation ran correctly.
MetricsLogTable.FieldName.MetricsDescription=Description
LogWriter.Level.Rowlevel.LongDesc=Rowlevel (very detailed)
LogWriter.Level.Rowlevel.LongDesc=Row Level (very detailed)
TransLogTable.FieldDescription.LinesWritten=The number of lines written by the specified step.
PerformanceLogTable.FieldDescription.StepName=The name of the step for which the performance snapshot was taken
TransLogTable.FieldName.LinesRead=Read
Expand All @@ -221,7 +221,7 @@ ChannelLogTable.FieldDescription.IdBatch=Batch ID
ChannelLogTable.FieldDescription.ObjectRevision=Repository object revision
JobLogTable.FieldName.DepDate=Dependency date
PerformanceLogTable.FieldName.Errors=Errors
LogWriter.Level.Basic.LongDesc=Basic logging
LogWriter.Level.Basic.LongDesc=Basic
CheckpointLogTable.FieldDescription.JobName=The job name
PerformanceLogTable.FieldName.StepName=Step name
TransLogTable.FieldName.ExecutingServer=Executing server
Expand All @@ -239,7 +239,7 @@ JobLogTable.FieldName.LinesRead=Read
JobEntryLogTable.FieldDescription.IdBatch=The job batch ID
TransLogTable.FieldDescription.Status=The status of the transformation \: start, end, stopped
ChannelLogTable.FieldName.ObjectCopy=Copy
LogWriter.Level.Error.LongDesc=Error logging only
LogWriter.Level.Error.LongDesc=Error
JobLogTable.FieldDescription.LogDate=The update time of this log record. If the job has status ''end'' it''s the end of the job.
JobEntryLogTable.Type.Description=Job entry log table
TransLogTable.FieldDescription.LinesInput=The number of lines read from disk or the network by the specified step. This is input from files, databases, etc.
Expand Down
37 changes: 37 additions & 0 deletions engine/src/org/pentaho/di/base/AbstractMeta.java
Expand Up @@ -176,6 +176,43 @@ public abstract class AbstractMeta implements ChangedFlagInterface, UndoInterfac

protected int undo_position;

private boolean showTransDialog = true;
private boolean showJobDialog = true;
private boolean alwaysShowTransCheckbox = true;
private boolean alwaysShowJobCheckbox = true;

public boolean isShowTransDialog() {
return showTransDialog;
}

public void setShowTransDialog( boolean showTransDialog ) {
this.showTransDialog = showTransDialog;
}

public boolean isShowJobDialog() {
return showJobDialog;
}

public void setShowJobDialog( boolean showJobDialog ) {
this.showJobDialog = showJobDialog;
}

public boolean isAlwaysShowTransCheckbox() {
return alwaysShowTransCheckbox;
}

public void setAlwaysShowTransCheckbox( boolean alwaysShowTransCheckbox ) {
this.alwaysShowTransCheckbox = alwaysShowTransCheckbox;
}

public boolean isAlwaysShowJobCheckbox() {
return alwaysShowJobCheckbox;
}

public void setAlwaysShowJobCheckbox( boolean alwaysShowJobCheckbox ) {
this.alwaysShowJobCheckbox = alwaysShowJobCheckbox;
}

/**
* The set of names of databases available only for this meta. The list is needed to distinguish connections when we
* load/save the meta in JCR repository.
Expand Down
185 changes: 0 additions & 185 deletions ui/src/org/pentaho/di/ui/ConfigurationDialog.java

This file was deleted.

0 comments on commit d648b45

Please sign in to comment.