From d9b24e77b5992362159c481a08655f27dbb9d1c5 Mon Sep 17 00:00:00 2001 From: Nhlavutelo Macebele Date: Mon, 6 May 2024 10:17:41 +0200 Subject: [PATCH 1/3] fixing query --- src/api/graphQL.js | 277 +++++++++++++++++++++++---------------------- 1 file changed, 139 insertions(+), 138 deletions(-) diff --git a/src/api/graphQL.js b/src/api/graphQL.js index 7849e87f..712552c0 100644 --- a/src/api/graphQL.js +++ b/src/api/graphQL.js @@ -277,153 +277,154 @@ export function queryStatistics (semester, partner) { if ( partner !== 'All' ) { par = `, partner: "${ partner }"` } + console.log(par) const query = ` { - statistics(semester:"${ semester }" ${ par }){ - proposals{ - numberOfProposals - newProposals - thesisProposals - p4Proposals - longTermProposals - newLongTermProposals - } - instruments{ - bvitRequestedTotal - hrsRequestedTotal - rssRequestedTotal - scamRequestedTotal - - bvitTotal - hrsTotal - rssTotal - scamTotal - - hrsResolutionRequestedTotal{ - lowResolution - mediumResolution - highResolution - highStability - intCalFibre - } - hrsResolutionTotal{ - lowResolution - mediumResolution - highResolution - highStability - intCalFibre - } - rssDetectorModeTotal{ - driftScan - frameTransfer - normal - shuffle - slotMode - } - rssDetectorModeRequestedTotal{ - driftScan - frameTransfer - normal - shuffle - slotMode - } - rssObservingModeRequestedTotal{ - fabryPerot - mos - mosPolarimetry - fabryPerotPolarimetry - spectroscopy - spectropolarimetry - imaging - polarimetricImaging - } - rssObservingModeTotal{ - fabryPerot - mos - mosPolarimetry - fabryPerotPolarimetry - spectroscopy - spectropolarimetry - imaging - polarimetricImaging - } - salticamDetectorModeRequestedTotal{ - driftScan - frameTransfer - normal - slotMode - } - salticamDetectorModeTotal{ - driftScan - frameTransfer - normal - slotMode - } + statistics(semester:"${ semester }" ${ par } ){ + proposals{ + numberOfProposals + newProposals + thesisProposals + p4Proposals + longTermProposals + newLongTermProposals + } + instruments{ + bvitRequestedTotal + hrsRequestedTotal + rssRequestedTotal + scamRequestedTotal + + bvitTotal + hrsTotal + rssTotal + scamTotal + + hrsResolutionRequestedTotal{ + lowResolution + mediumResolution + highResolution + highStability + intCalFibre + } + hrsResolutionTotal{ + lowResolution + mediumResolution + highResolution + highStability + intCalFibre + } + rssDetectorModeTotal{ + driftScan + frameTransfer + normal + shuffle + slotMode + } + rssDetectorModeRequestedTotal{ + driftScan + frameTransfer + normal + shuffle + slotMode + } + rssObservingModeRequestedTotal{ + fabryPerot + mos + mosPolarimetry + fabryPerotPolarimetry + spectroscopy + spectropolarimetry + imaging + polarimetricImaging + } + rssObservingModeTotal{ + fabryPerot + mos + mosPolarimetry + fabryPerotPolarimetry + spectroscopy + spectropolarimetry + imaging + polarimetricImaging + } + salticamDetectorModeRequestedTotal{ + driftScan + frameTransfer + normal + slotMode + } + salticamDetectorModeTotal{ + driftScan + frameTransfer + normal + slotMode + } + } + observingConditions{ + seeing{ + timeRequested{ + between0And1Dot5 + between1Dot5And2 + between2And2Dot5 + between2Dot5And3 + moreThan3 } - observingConditions{ - seeing{ - timeRequested{ - lessEqual1Dot5 - lessEqual2 - lessEqual2Dot5 - lessEqual3 - moreThan3 - } - numberOfProposals{ - lessEqual1Dot5 - lessEqual2 - lessEqual2Dot5 - lessEqual3 - moreThan3 - } - } - transparency{ - timeRequested{ - any - clear - thinCloud - thickCloud - } - numberOfProposals{ - any - clear - thinCloud - thickCloud - } - } + numberOfProposals{ + between0And1Dot5 + between1Dot5And2 + between2And2Dot5 + between2Dot5And3 + moreThan3 + } + } + transparency{ + timeRequested{ + any + clear + thinCloud + thickCloud } - timeBreakdown{ - engineering - idle - lostToProblems - lostToWeather - science + numberOfProposals{ + any + clear + thinCloud + thickCloud } - completion{ - partner - sharePercentage - summary{ - allocatedTime{ - p0 - p1 - p2 - p3 - } - observedTime{ - p0 - p1 - p2 - p3 - } - } + } + } + timeBreakdown{ + engineering + idle + lostToProblems + lostToWeather + science + } + completion{ + partner + sharePercentage + summary{ + allocatedTime{ + p0 + p1 + p2 + p3 } - targets{ - isOptional - rightAscension - declination + observedTime{ + p0 + p1 + p2 + p3 } } } + targets{ + isOptional + rightAscension + declination + } + } +} ` return graphqlClient().post('/graphql', { query }) .then( From 67cebd760d1bece88e763c23f3a58756e91972b7 Mon Sep 17 00:00:00 2001 From: Nhlavutelo Macebele Date: Mon, 6 May 2024 10:18:51 +0200 Subject: [PATCH 2/3] fixing query --- package.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/package.json b/package.json index 97af2aa0..5baf5f05 100644 --- a/package.json +++ b/package.json @@ -16,9 +16,6 @@ "d3": "^4.12.0", "d3-contour": "^1.1.1", "d3-scale-chromatic": "^1.1.1", - "enzyme": "^3.3.0", - "enzyme-adapter-react-16": "^1.1.1", - "enzyme-to-json": "^3.3.1", "fetch-mock": "^6.0.0", "file-saver": "^1.3.3", "graphql": "^0.11.7", @@ -40,7 +37,6 @@ "react-router-dom": "^4.2.2", "react-scripts": "^1.0.17", "react-select": "^1.0.0-rc.10", - "react-test-renderer": "^16.2.0", "redux": "^3.7.2", "redux-devtools-extension": "^2.13.2", "redux-mock-store": "^1.5.1", @@ -67,6 +63,7 @@ "babel-eslint": "^8.2.3", "enzyme": "^3.3.0", "enzyme-adapter-react-16": "^1.1.1", + "enzyme-to-json": "^3.3.1", "eslint": "^8.13.0", "eslint-config-airbnb": "^16.1.0", "eslint-config-airbnb-standard": "^3.1.0", From bbf47a3ce1b2aacc44a13b01bc853764f2b637af Mon Sep 17 00:00:00 2001 From: Nhlavutelo Macebele Date: Mon, 6 May 2024 10:31:38 +0200 Subject: [PATCH 3/3] review fix --- src/api/graphQL.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/api/graphQL.js b/src/api/graphQL.js index 712552c0..a559da28 100644 --- a/src/api/graphQL.js +++ b/src/api/graphQL.js @@ -277,7 +277,6 @@ export function queryStatistics (semester, partner) { if ( partner !== 'All' ) { par = `, partner: "${ partner }"` } - console.log(par) const query = ` { statistics(semester:"${ semester }" ${ par } ){ @@ -371,10 +370,10 @@ export function queryStatistics (semester, partner) { moreThan3 } numberOfProposals{ - between0And1Dot5 + between0And1Dot5 between1Dot5And2 between2And2Dot5 - between2Dot5And3 + between2Dot5And3 moreThan3 } }