diff --git a/checkin_notes b/checkin_notes index 56d1ccc678..9a4b984731 100755 --- a/checkin_notes +++ b/checkin_notes @@ -4852,3 +4852,10 @@ David 11 May 2007 html/user/ show_user.php + +David 11 May 2007 + - Manager: show (in Project/status) if a sched RPC is in progress + + clientgui/ + ViewProjects.cpp + ViewProjectsGrid.cpp diff --git a/clientgui/ViewProjects.cpp b/clientgui/ViewProjects.cpp index 844a411edb..aab8b3a107 100644 --- a/clientgui/ViewProjects.cpp +++ b/clientgui/ViewProjects.cpp @@ -691,6 +691,9 @@ wxInt32 CViewProjects::FormatStatus(wxInt32 item, wxString& status) const { append_to_status(status, _("Scheduler request pending")); append_to_status(status, wxString(rpc_reason_string(project->sched_rpc_pending), wxConvUTF8)); } + if (project->scheduler_rpc_in_progress) { + append_to_status(strBuffer, _("Scheduler request in progress")); + } wxDateTime dtNextRPC((time_t)project->min_rpc_time); wxDateTime dtNow(wxDateTime::Now()); if (dtNextRPC > dtNow) { diff --git a/clientgui/ViewProjectsGrid.cpp b/clientgui/ViewProjectsGrid.cpp index 4290978720..53376ca5c6 100644 --- a/clientgui/ViewProjectsGrid.cpp +++ b/clientgui/ViewProjectsGrid.cpp @@ -613,6 +613,9 @@ void CViewProjectsGrid::FormatStatus(wxInt32 item, wxString& strBuffer) { append_to_status(strBuffer, _("Scheduler request pending")); append_to_status(strBuffer, wxString(rpc_reason_string(project->sched_rpc_pending), wxConvUTF8)); } + if (project->scheduler_rpc_in_progress) { + append_to_status(strBuffer, _("Scheduler request in progress")); + } wxDateTime dtNextRPC((time_t)project->min_rpc_time); wxDateTime dtNow(wxDateTime::Now()); if (dtNextRPC > dtNow) { diff --git a/lib/gui_rpc_client.h b/lib/gui_rpc_client.h index 873d8bf0ef..59e522440d 100644 --- a/lib/gui_rpc_client.h +++ b/lib/gui_rpc_client.h @@ -100,7 +100,7 @@ public: double duration_correction_factor; bool master_url_fetch_pending; // need to fetch and parse the master URL - int sched_rpc_pending; // contact scheduling server for preferences + int sched_rpc_pending; // need to contact scheduling server int rr_sim_deadlines_missed; bool tentative; // master URL and account ID not confirmed bool non_cpu_intensive;