schulze/hallbarUtvecklingVT7
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #9 from thefeli73/we-select-user

Browse Source 
Add: Multiple disruptions
This commit is contained in:
William Eriksson 2020-12-08 12:10:51 +01:00 committed by GitHub
commit b207b464bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/components/DisruptionButton.js
View File

@ -3,7 +3,7 @@ import addNotification from "react-push-notification";
import globData from '../GlobalData.js'; import globData from '../GlobalData.js';
import ex1 from '../APIexamples/disruption1.json' import ex1 from '../APIexamples/disruption1.json'
import ex2 from '../APIexamples/disruption1.json' import ex2 from '../APIexamples/disruption2.json'
import Button from './Button.js'; import Button from './Button.js';
import disruptIcon from '../img/flash.svg'; import disruptIcon from '../img/flash.svg';
@ -17,12 +17,20 @@ class DisruptionButton extends Button {
genDisrupt = () => { genDisrupt = () => {
this.state.disruption = "" this.state.disruption = ""
for (let stopPoint of ex1.affectedStopPoints) { if(this.state.jsonLocation === "ex1"){
if(stopPoint.gid === globData.user.stoppointgid){ for (let stopPoint of ex1.affectedStopPoints) {
this.state.disruption = ex1 if(stopPoint.gid === globData.user.stoppointgid){
this.state.disruption = ex1
}
}
} else if (this.state.jsonLocation === "ex2"){
for (let stopPoint of ex2.affectedStopPoints) {
if(stopPoint.gid === globData.user.stoppointgid){
this.state.disruption = ex2
}
} }
} }
console.log(this.state.disruption) console.log(this.state.disruption)
globData.disruption = this.state.disruption globData.disruption = this.state.disruption

1
src/components/NavigationDrawer.js
View File

@ -69,6 +69,7 @@ class NavigationDrawer extends Component {
<SelectUserButton path={"user3"} username="user3"/> <SelectUserButton path={"user3"} username="user3"/>
<SelectUserButton path={"user4"} username="user4"/> <SelectUserButton path={"user4"} username="user4"/>
<DisruptionButton path={"ex1"} onClick={[this.showPopup, this.close]} /> <DisruptionButton path={"ex1"} onClick={[this.showPopup, this.close]} />
<DisruptionButton path={"ex2"} onClick={[this.showPopup, this.close]} />
</div> </div>
<hr /> <hr />
<span id="version">Projektgrupp 3 - Utmaning 7</span> <span id="version">Projektgrupp 3 - Utmaning 7</span>