From a9fc9ce2035e0db07baa6e732200265a90f66332 Mon Sep 17 00:00:00 2001 From: Jeffrey Armstrong Date: Mon, 27 Jun 2022 16:52:40 -0400 Subject: Added player report of task type, which the captain will show in the job summary. --- player/endpoints.f90 | 8 +++++++- player/instructions.f90 | 4 +++- 2 files changed, 10 insertions(+), 2 deletions(-) (limited to 'player') diff --git a/player/endpoints.f90 b/player/endpoints.f90 index 8708592..60e96af 100644 --- a/player/endpoints.f90 +++ b/player/endpoints.f90 @@ -91,7 +91,7 @@ contains end subroutine get_check_in_url - subroutine get_status_url(job, step, url, posting, status) + subroutine get_status_url(job, step, url, posting, status, task_type) use config use utilities, only: replace_field implicit none @@ -100,6 +100,7 @@ contains integer, intent(in)::step logical, intent(in), optional::posting integer, intent(in), optional::status + character(len=*), intent(in), optional::task_type character(*), intent(out)::url character(32)::int_text @@ -115,6 +116,11 @@ contains if(present(status)) then url = trim(url)//"?status="//trim(status_text(status)) + if(present(task_type)) then + url = trim(url)//"&type="//trim(task_type) + end if + else if(present(task_type)) then + url = trim(url)//"?type="//trim(task_type) end if call append_query_token(url) diff --git a/player/instructions.f90 b/player/instructions.f90 index 300fa2a..f9be1f9 100644 --- a/player/instructions.f90 +++ b/player/instructions.f90 @@ -405,6 +405,7 @@ contains logical::res character(len=:), pointer::captured_filename character(len=1024)::url + character(len=40)::operation task_count = get_task_count(j) @@ -412,8 +413,9 @@ contains ! Remember to zero-index your json! do i = 1, task_count + call get_task_operation(j, i, operation) + call get_status_url(job_id, i, url, status=STATUS_STARTING, task_type=operation) - call get_status_url(job_id, i, url, status=STATUS_STARTING) Print *, "Reporting: "//trim(url) server_status = request_to_ignored(url) -- cgit v1.2.3