From e6da7b6ba967ebc1a96b9d9c787b59c41a266e05 Mon Sep 17 00:00:00 2001 From: Henri Casanova Date: Wed, 24 Aug 2022 11:26:06 -1000 Subject: [PATCH 01/11] typo-- --- web/src/components/feedback/feedback.js | 4 ++-- .../include_client_server/client_server_basics.js | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/web/src/components/feedback/feedback.js b/web/src/components/feedback/feedback.js index d6ad60de..7f6d8ae3 100644 --- a/web/src/components/feedback/feedback.js +++ b/web/src/components/feedback/feedback.js @@ -126,7 +126,7 @@ const Feedback = ({tabkey}) => { {errors.quality} : '' }

- [#3] Optionally provide constructing comments. + [#3] Optionally provide constructive comments.

{ ) } -export default Feedback \ No newline at end of file +export default Feedback diff --git a/web/src/pages/pedagogic_modules/include_client_server/client_server_basics.js b/web/src/pages/pedagogic_modules/include_client_server/client_server_basics.js index 02ea88a9..25e8e56c 100644 --- a/web/src/pages/pedagogic_modules/include_client_server/client_server_basics.js +++ b/web/src/pages/pedagogic_modules/include_client_server/client_server_basics.js @@ -14,6 +14,8 @@ import PracticeQuestionNumeric from "../../../components/practice-questions/nume import PracticeQuestionMultiChoice from "../../../components/practice-questions/multichoice"; const ClientServerBasics = ({module, tab}) => { + + return ( <> { actual processing.

+

The performance of a client-server setup thus depends on the network on which the data is transferred back and forth, and on the hardware at the From ed270e6e76ca189cc84fab82dc3fd97f0e975e54 Mon Sep 17 00:00:00 2001 From: Henri Casanova Date: Wed, 24 Aug 2022 11:27:18 -1000 Subject: [PATCH 02/11] fixed typo --- web/src/components/feedback/feedback.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/src/components/feedback/feedback.js b/web/src/components/feedback/feedback.js index 7f6d8ae3..339f6544 100644 --- a/web/src/components/feedback/feedback.js +++ b/web/src/components/feedback/feedback.js @@ -7,7 +7,7 @@ import FeedbackSignIn from "./feedback_signin" const Feedback = ({tabkey}) => { const [auth, setAuth] = useState("false") const [completed, setCompleted] = useState(false) - const useful = ['Very Useful', 'Useful', 'Neutral', 'Useless'] + const useful = ['Very Useful', 'Useful', 'Of Little Use', 'Not Useful'] const quality = ['Excellent Quality', 'Good Quality', 'Fair Quality', 'Poor Quality'] useEffect(() => { From f0a75ab8ee895c35320eefd7d9ccfbd73cca4102 Mon Sep 17 00:00:00 2001 From: Henri Casanova Date: Wed, 24 Aug 2022 11:35:00 -1000 Subject: [PATCH 03/11] Typo-- --- web/src/components/simulation/simulation_feedback.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/web/src/components/simulation/simulation_feedback.js b/web/src/components/simulation/simulation_feedback.js index ad48c169..e389753d 100644 --- a/web/src/components/simulation/simulation_feedback.js +++ b/web/src/components/simulation/simulation_feedback.js @@ -8,7 +8,7 @@ import "./simulation_feedback.css" const SimulationFeedback = ({simulationID, trigger}) => { const userEmail = localStorage.getItem("currentUser") const userName = localStorage.getItem("userName") - const ratings = ['Perfect', 'Good', 'Poor', 'Bad'] + const ratings = ['Excellent', 'Good', 'Fair', 'Poor'] const [open, setOpen] = useState(false) const [complete, setComplete] = useState(false) useEffect(() => { @@ -99,7 +99,7 @@ const SimulationFeedback = ({simulationID, trigger}) => { {errors.rating ? {errors.rating} : '' } -

Optionally provide us with additional feedback

+

Additional constructive feedback:

{ ) } -export default SimulationFeedback \ No newline at end of file +export default SimulationFeedback From 0d9be3f318bc31e660fc9535e5250a2ebc6f9e0d Mon Sep 17 00:00:00 2001 From: Henri Casanova Date: Wed, 24 Aug 2022 11:36:49 -1000 Subject: [PATCH 04/11] typo-- --- web/src/components/feedback/feedback.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/src/components/feedback/feedback.js b/web/src/components/feedback/feedback.js index 339f6544..9db4726d 100644 --- a/web/src/components/feedback/feedback.js +++ b/web/src/components/feedback/feedback.js @@ -7,8 +7,8 @@ import FeedbackSignIn from "./feedback_signin" const Feedback = ({tabkey}) => { const [auth, setAuth] = useState("false") const [completed, setCompleted] = useState(false) - const useful = ['Very Useful', 'Useful', 'Of Little Use', 'Not Useful'] - const quality = ['Excellent Quality', 'Good Quality', 'Fair Quality', 'Poor Quality'] + const useful = ['Very Useful', 'Useful', 'Of Little Use', 'Not Useful at all'] + const quality = ['Excellent', 'Good', 'Fair', 'Poor'] useEffect(() => { setAuth(localStorage.getItem("login")) From 9bd4780ffa2a7d944f697679275eb3258872e189 Mon Sep 17 00:00:00 2001 From: Henri Casanova Date: Wed, 24 Aug 2022 11:50:05 -1000 Subject: [PATCH 05/11] typos-- --- .../components/charts/global_statistics.js | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/web/src/components/charts/global_statistics.js b/web/src/components/charts/global_statistics.js index 923f1877..bcc79536 100644 --- a/web/src/components/charts/global_statistics.js +++ b/web/src/components/charts/global_statistics.js @@ -37,54 +37,54 @@ const GlobalStatistics = ({ data }) => { feedback: ["Very Useful"], count: 0, }, - "Kinda Useful": { + "Useful": { feedback: ["Useful"], count: 0, }, - "Sorta Useful": { - feedback: ["Neutral"], + "Of Little Use": { + feedback: ["Of Little Use"], count: 0, }, - "Useless": { - feedback: ["Useless"], + "Not Useful at all": { + feedback: ["Not Useful at all"], count: 0, }, } let qualityMap = { "Excellent Quality": { - feedback: ["Excellent Quality"], + feedback: ["Excellent"], count: 0, }, "Good Quality": { - feedback: ["Good Quality"], + feedback: ["Good"], count: 0, }, "Fair Quality": { - feedback: ["Fair Quality"], + feedback: ["Fair"], count: 0, }, "Poor Quality": { - feedback: ["Poor Quality"], + feedback: ["Poor"], count: 0, }, } let simFeedbackMap = { - "Perfect Experience": { - feedback: ["Perfect"], + "Excellent Experience": { + feedback: ["Excellent"], count: 0, }, "Good Experience": { feedback: ["Good"], count: 0, }, - "Poor Experience": { - feedback: ["Poor"], + "Fair Experience": { + feedback: ["Fair"], count: 0, }, - "Bad Experience": { - feedback: ["Bad"], + "Poor Experience": { + feedback: ["Poor"], count: 0, }, } From 0777736882ae6233d246884bec44770eb12e93af Mon Sep 17 00:00:00 2001 From: Henri Casanova Date: Fri, 26 Aug 2022 17:05:23 -1000 Subject: [PATCH 06/11] fixing small db bugs --- web/src/components/simulation/simulation_feedback.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/src/components/simulation/simulation_feedback.js b/web/src/components/simulation/simulation_feedback.js index e389753d..f56582a0 100644 --- a/web/src/components/simulation/simulation_feedback.js +++ b/web/src/components/simulation/simulation_feedback.js @@ -40,7 +40,7 @@ const SimulationFeedback = ({simulationID, trigger}) => { { @@ -96,6 +96,7 @@ const SimulationFeedback = ({simulationID, trigger}) => { /> )} + {errors.rating ? {errors.rating} : '' } From 11214ba58fb5e6003e5a61fb925b22e7025c4820 Mon Sep 17 00:00:00 2001 From: Henri Casanova Date: Fri, 26 Aug 2022 17:16:50 -1000 Subject: [PATCH 07/11] tmp --- web/src/components/simulation/simulation_feedback.js | 1 - 1 file changed, 1 deletion(-) diff --git a/web/src/components/simulation/simulation_feedback.js b/web/src/components/simulation/simulation_feedback.js index f56582a0..d0d31271 100644 --- a/web/src/components/simulation/simulation_feedback.js +++ b/web/src/components/simulation/simulation_feedback.js @@ -4,7 +4,6 @@ import { Formik } from "formik" import axios from "axios" import "./simulation_feedback.css" - const SimulationFeedback = ({simulationID, trigger}) => { const userEmail = localStorage.getItem("currentUser") const userName = localStorage.getItem("userName") From 0a4cce0d1ccb430bb368cf4eb3e46f447862a6d4 Mon Sep 17 00:00:00 2001 From: Henri Casanova Date: Fri, 26 Aug 2022 18:24:14 -1000 Subject: [PATCH 08/11] bug-- --- web/src/components/simulation/simulation_feedback.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/src/components/simulation/simulation_feedback.js b/web/src/components/simulation/simulation_feedback.js index d0d31271..c0ac843c 100644 --- a/web/src/components/simulation/simulation_feedback.js +++ b/web/src/components/simulation/simulation_feedback.js @@ -83,11 +83,11 @@ const SimulationFeedback = ({simulationID, trigger}) => {

How was your experience with this simulation?

{ratings.map((rating) => - + Date: Mon, 29 Aug 2022 15:37:27 -1000 Subject: [PATCH 09/11] bug-- --- web/src/components/charts/usage_statistics.js | 8 +++++++- web/src/pages/about.js | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/web/src/components/charts/usage_statistics.js b/web/src/components/charts/usage_statistics.js index 6abfa619..1ae50674 100644 --- a/web/src/components/charts/usage_statistics.js +++ b/web/src/components/charts/usage_statistics.js @@ -43,6 +43,10 @@ const UsageStatistics = ({ data }) => { "simulation": ["workflow_distributed", "workflow_fundamentals", "workflow_task_data_parallelism"], "count": 0 }, + "C.2 Cloud Functions": { + "simulation": ["cloud_functions"], + "count": 0 + }, "D.1 Case Study: Energy-Aware Workflow Execution": { "simulation": ["thrustd_cloud", "thrustd"], "count": 0 @@ -56,6 +60,7 @@ const UsageStatistics = ({ data }) => { let usage = data[idx] let time = new Date(usage["time"] * 1000) minMonth = Math.min(minMonth, time.getMonth()) + console.log("MINMONTH = " + minMonth) minYear = Math.min(minYear, time.getFullYear()) for (let m in simulationModulesMap) { @@ -66,6 +71,7 @@ const UsageStatistics = ({ data }) => { } } } + minMonth = (["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"])[minMonth] let chartData = { labels: [], @@ -119,7 +125,7 @@ const UsageStatistics = ({ data }) => { return ( <> - Total Number of Simulation Runs (since {minMonth}/{minYear}) + Total Number of Simulation Runs (since {minMonth} {minYear}) diff --git a/web/src/pages/about.js b/web/src/pages/about.js index 97eeed95..5b31da6c 100644 --- a/web/src/pages/about.js +++ b/web/src/pages/about.js @@ -110,11 +110,11 @@ const About = () => { -

Usage Statistics

+

Simulation Usage Statistics

{usageStatisticsResults} -

Global Statistics

+

Practice Questions and Feedback Statistics

{globalStatisticsResults} From 33e6cebd4f93f69d768deb31ef347b6a991754be Mon Sep 17 00:00:00 2001 From: Henri Casanova Date: Mon, 29 Aug 2022 18:30:37 -1000 Subject: [PATCH 10/11] bug-- --- web/src/components/charts/global_statistics.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/web/src/components/charts/global_statistics.js b/web/src/components/charts/global_statistics.js index bcc79536..5a06aff0 100644 --- a/web/src/components/charts/global_statistics.js +++ b/web/src/components/charts/global_statistics.js @@ -116,6 +116,7 @@ const GlobalStatistics = ({ data }) => { practiceQuestionMap.Attempts.count += global["attempts"] } + let questionChartData = { labels: [], datasets: [], @@ -167,6 +168,8 @@ const GlobalStatistics = ({ data }) => { } } + minMonth = (["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"])[minMonth] + let usefulChartData = { labels: [], datasets: [], @@ -240,6 +243,8 @@ const GlobalStatistics = ({ data }) => { } } + minMonth = (["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"])[minMonth] + let simFeedbackChartData = { labels: [], datasets: [], @@ -307,13 +312,13 @@ const GlobalStatistics = ({ data }) => { <> - Practice Questions (since {minMonth}/{minYear}) + Practice Questions (since {minMonth} {minYear}) - Feedback provided by EduWRENCH users (since {minMonth}/{minYear}) + Feedback provided by EduWRENCH users (since {minMonth} {minYear})
From 93f1532d08380ab25ac7741f8054abd2c3770db9 Mon Sep 17 00:00:00 2001 From: Henri Casanova Date: Tue, 30 Aug 2022 09:25:30 -1000 Subject: [PATCH 11/11] bug-- --- web/src/components/charts/global_statistics.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/web/src/components/charts/global_statistics.js b/web/src/components/charts/global_statistics.js index 5a06aff0..d1288402 100644 --- a/web/src/components/charts/global_statistics.js +++ b/web/src/components/charts/global_statistics.js @@ -116,7 +116,6 @@ const GlobalStatistics = ({ data }) => { practiceQuestionMap.Attempts.count += global["attempts"] } - let questionChartData = { labels: [], datasets: [], @@ -168,8 +167,6 @@ const GlobalStatistics = ({ data }) => { } } - minMonth = (["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"])[minMonth] - let usefulChartData = { labels: [], datasets: [],