Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Query fix #203

Open
wants to merge 3 commits into
base: development
Choose a base branch
from
Open

Query fix #203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d9b24e7
fixing query
Eb-Zeero May 6, 2024
67cebd7
fixing query
Eb-Zeero May 6, 2024
bbf47a3
review fix
Eb-Zeero May 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand Down
276 changes: 138 additions & 138 deletions src/api/graphQL.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,151 +279,151 @@ export function queryStatistics (semester, partner) {
}
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(
Expand Down