implemented workflow run history
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/commit/4c0448bd Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/4c0448bd Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/4c0448bd Branch: refs/heads/master Commit: 4c0448bddaefaad60891958ee01aec8a07e664ad Parents: e296982 Author: larrytech7 <[email protected]> Authored: Sun Jul 19 13:40:40 2015 +0100 Committer: larrytech7 <[email protected]> Committed: Sun Jul 19 13:40:40 2015 +0100 ---------------------------------------------------------------------- .../java/org/apache/taverna/mobile/adapters/RunAdapter.java | 5 +++-- .../java/org/apache/taverna/mobile/tavernamobile/Runs.java | 9 +++++++++ .../java/org/apache/taverna/mobile/utils/DetailsLoader.java | 3 +++ app/src/main/res/layout/workflow_run_item.xml | 7 +++++++ 4 files changed, 22 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/4c0448bd/app/src/main/java/org/apache/taverna/mobile/adapters/RunAdapter.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/adapters/RunAdapter.java b/app/src/main/java/org/apache/taverna/mobile/adapters/RunAdapter.java index fbc5c30..e22d2e1 100644 --- a/app/src/main/java/org/apache/taverna/mobile/adapters/RunAdapter.java +++ b/app/src/main/java/org/apache/taverna/mobile/adapters/RunAdapter.java @@ -97,7 +97,7 @@ public class RunAdapter extends RecyclerView.Adapter<RunAdapter.RunHolder> { holder.runtitle.setText(lRun.getRun_name()); holder.runstarted.setText(lRun.getRun_started_date()); holder.runfinished.setText(lRun.getRun_ended_date()); - + holder.runAuthor.setText("Author->"+lRun.getRun_author()); switch(lRun.getState()){ case RUNNING: holder.runStatus.setImageResource(android.R.drawable.presence_busy); @@ -135,12 +135,13 @@ public class RunAdapter extends RecyclerView.Adapter<RunAdapter.RunHolder> { } public static class RunHolder extends RecyclerView.ViewHolder { - public final TextView runtitle, runstarted, runfinished,textState; + public final TextView runtitle, runstarted, runfinished,textState,runAuthor; public final ImageButton runStatus; public RunHolder(View itemView) { super(itemView); runtitle = (TextView) itemView.findViewById(R.id.runtitle); + runAuthor = (TextView) itemView.findViewById(R.id.run_authorTextview); runstarted = (TextView) itemView.findViewById(R.id.runstarted); runfinished = (TextView) itemView.findViewById(R.id.runfinished); runStatus = (ImageButton) itemView.findViewById(R.id.imageButtonState); http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/4c0448bd/app/src/main/java/org/apache/taverna/mobile/tavernamobile/Runs.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/tavernamobile/Runs.java b/app/src/main/java/org/apache/taverna/mobile/tavernamobile/Runs.java index 199f008..8eeba06 100644 --- a/app/src/main/java/org/apache/taverna/mobile/tavernamobile/Runs.java +++ b/app/src/main/java/org/apache/taverna/mobile/tavernamobile/Runs.java @@ -11,6 +11,7 @@ public class Runs { private String run_started_date; private String run_ended_date; private String state; + private String run_author; public static enum RUN_STATE { FAILED,FINISHED,RUNNING}; @@ -66,6 +67,14 @@ public class Runs { this.run_started_date = run_started_date; } + public String getRun_author() { + return run_author; + } + + public void setRun_author(String run_author) { + this.run_author = run_author; + } + public String getRun_ended_date() { return run_ended_date; } http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/4c0448bd/app/src/main/java/org/apache/taverna/mobile/utils/DetailsLoader.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/utils/DetailsLoader.java b/app/src/main/java/org/apache/taverna/mobile/utils/DetailsLoader.java index 81fdb68..0af5a98 100644 --- a/app/src/main/java/org/apache/taverna/mobile/utils/DetailsLoader.java +++ b/app/src/main/java/org/apache/taverna/mobile/utils/DetailsLoader.java @@ -166,6 +166,8 @@ public class DetailsLoader extends AsyncTaskLoader<Workflow> { String started = jsonObject.getString("start_time"); String ended = jsonObject.getString("finish_time"); String state = jsonObject.getString("state"); + JSONObject userobj = jsonObject.getJSONObject("user"); + String username = userobj.getString("name"); StringBuffer nm = new StringBuffer(), ur = new StringBuffer(); for(String n: name.toLowerCase().split(" ")) nm.append(n); @@ -176,6 +178,7 @@ public class DetailsLoader extends AsyncTaskLoader<Workflow> { Runs mrun = new Runs(name,started,ended,state); mrun.setRun_id(id); mrun.setRun_workflow_id(workflow_id); + mrun.setRun_author(username); workflow.addWorkflowRun(mrun); } http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/4c0448bd/app/src/main/res/layout/workflow_run_item.xml ---------------------------------------------------------------------- diff --git a/app/src/main/res/layout/workflow_run_item.xml b/app/src/main/res/layout/workflow_run_item.xml index 048ec6e..9cfab70 100644 --- a/app/src/main/res/layout/workflow_run_item.xml +++ b/app/src/main/res/layout/workflow_run_item.xml @@ -42,6 +42,13 @@ limitations under the License. android:id="@+id/runtitle" android:layout_gravity="center_horizontal" /> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textAppearance="?android:attr/textAppearanceLarge" + android:text="author" + android:id="@+id/run_authorTextview" /> + <LinearLayout android:orientation="horizontal" android:layout_width="match_parent"
