Skip to content

Commit 6b68b86

Browse files
committed
a
1 parent b5a859b commit 6b68b86

File tree

6 files changed

+20
-62
lines changed

6 files changed

+20
-62
lines changed

assets/packets/packets.json

Lines changed: 8 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -30,57 +30,19 @@
3030
"packet_2": {
3131
"title": "packet_2",
3232
"packet": {
33-
"Message": "Important mission for your first day, huh? Do you already know about the manual, right? Today we are going to take an important step in the conquest of the red planet. The Perseverance spacecraft will arrive here in a few hours and we need to schedule the packets that will be received by each antenna. Check out the new information available in your manual.",
34-
"Spacecrafts": {
35-
"InSight_Lander": {
36-
"priority": "MEDIUM",
37-
"frequency": 7.18
38-
},
39-
"Maren": {
40-
"priority": "MEDIUM",
41-
"frequency": 7.18
42-
},
43-
"Mars_Odyssey": {
44-
"priority": "MEDIUM",
45-
"frequency": 7.48
46-
},
47-
"Mars_2020": {
48-
"priority": "HIGH",
49-
"frequency": 7.48
50-
},
51-
"Mars_Reconnaissance_Orbiter": {
52-
"priority": "MEDIUM",
53-
"frequency": 7.82
54-
}
55-
}
33+
"Message": "Problem, we don’t receive the information from I’m lost. "
5634
}
5735
},
5836
"packet_3": {
5937
"title": "packet_3",
6038
"packet": {
61-
"Message": "Important mission for your first day, huh? Do you already know about the manual, right? Today we are going to take an important step in the conquest of the red planet. The Perseverance spacecraft will arrive here in a few hours and we need to schedule the packets that will be received by each antenna. Check out the new information available in your manual.",
62-
"Spacecrafts": {
63-
"InSight_Lander": {
64-
"priority": "MEDIUM",
65-
"frequency": 7.18
66-
},
67-
"Maren": {
68-
"priority": "MEDIUM",
69-
"frequency": 7.18
70-
},
71-
"Mars_Odyssey": {
72-
"priority": "MEDIUM",
73-
"frequency": 7.48
74-
},
75-
"Mars_2020": {
76-
"priority": "HIGH",
77-
"frequency": 7.48
78-
},
79-
"Mars_Reconnaissance_Orbiter": {
80-
"priority": "MEDIUM",
81-
"frequency": 7.82
82-
}
83-
}
39+
"Message": "I have received some of the data, it is a little bit inconsistent."
40+
}
41+
},
42+
"packet_4": {
43+
"title": "packet_3",
44+
"packet": {
45+
"Message": "Everything is right and working, thank you a lot"
8446
}
8547
}
8648
}

src/components/display/display.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ module.exports = class Display extends component {
2222
}
2323
addDisplay(display) {
2424
this.displayGroup[display.displayName] = display.htmlComponent;
25-
console.log(this.displayGroup[display.displayName]);
25+
2626
this.htmlComponent.appendChild(this.displayGroup[display.displayName]);
2727
display.build();
2828
}

src/components/display/displays/DSNdisplay/DSNdisplay.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ module.exports = class Display extends StandardDisplay {
6969
let answersList =[document.getElementById('1_0').textContent, document.getElementById('1_1').textContent, document.getElementById('1_2').textContent];
7070
let allAnswersList = [document.getElementById('1_0').textContent, document.getElementById('1_1').textContent, document.getElementById('1_2').textContent, document.getElementById('2_0').textContent, document.getElementById('3_0').textContent, document.getElementById('4_0').textContent];
7171

72-
console.log(allAnswersList);
72+
7373

7474
if (answersList.includes("Maren") && answersList.includes("Mars 2020")){
7575
return new Wrong();

src/components/display/displays/TutorialDisplay/TutorialDisplay.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -80,13 +80,13 @@ module.exports = class TutorialDisplay extends Component {
8080
add(text, role) {
8181
var dialogos = document.getElementsByClassName("texts");
8282
var texts = dialogos[0];
83-
// console.log(this.texts);
83+
8484
texts.appendChild(this.createText(text, role));
8585

8686
}
8787

8888
showTutorial() {
89-
console.log(this.timer);
89+
9090
this.flow.forEach(
9191
(point) => {
9292
if (this.timer == point.time) {
@@ -104,7 +104,7 @@ module.exports = class TutorialDisplay extends Component {
104104

105105
build() {
106106

107-
console.log(this.texts);
107+
108108

109109
let divActors = document.createElement('div');
110110
divActors.className = "actors";
@@ -140,7 +140,7 @@ module.exports = class TutorialDisplay extends Component {
140140

141141
let divScreen = document.createElement('div');
142142
divScreen.className = "screen";
143-
console.log(this.texts);
143+
144144
divScreen.appendChild(this.texts);
145145
divScreen.appendChild(divActors);
146146

@@ -166,9 +166,9 @@ module.exports = class TutorialDisplay extends Component {
166166

167167
window.addEventListener('showDisplay', (event) => {
168168
if (event.detail == "TutorialDisplay") {
169-
console.log(this.timestep);
169+
170170
this.showTutorial();
171-
console.log("dasda");
171+
172172
this.interval = setInterval(() => {
173173
this.showTutorial();
174174
}, this.timestep);

src/components/display/displays/communication/communication.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,13 +85,14 @@ module.exports = class Communication extends StandardDisplay {
8585
setTimeout(() =>{
8686
document.getElementById('SendProgressBar').classList.add("invisible")
8787
document.getElementById('sendpg').style.width = '0%';
88+
document.getElementById('SendProgressBar').stageChangesContainer.add("invisible")
8889

8990
if(window.configAntenas === undefined || window.configAntenas === -1){
90-
GlobalMecanics.sendPacket(,200);
91+
GlobalMecanics.sendPacket('packet_2',2000)
9192
}else if(window.configAntenas === 0){
92-
93+
GlobalMecanics.sendPacket('packet_3',2000)
9394
}else if(window.configAntenas === 1){
94-
95+
GlobalMecanics.sendPacket('packet_4',2000)
9596
}
9697

9798
},500)

src/components/options/options.js

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,6 @@ module.exports = class Options extends component {
8282
this.mainMenuOptionGroup.addOption('/Communication', this.callMenuFunction('Communication'))
8383
this.mainMenuOptionGroup.addOption('/Manual', this.callOptionGroupFunction('manualOptionGroup'))
8484
this.mainMenuOptionGroup.addOption('/Tools', this.callOptionGroupFunction('toolsOptionGroup'))
85-
this.mainMenuOptionGroup.addOption('/Statistics')
86-
this.mainMenuOptionGroup.addOption('/Settings')
8785
}
8886

8987
toolsOptionGroupOpt() {
@@ -99,12 +97,9 @@ module.exports = class Options extends component {
9997
this.optionsGroups['tools'] = this.manualOptionGroup.htmlComponent;
10098

10199
this.manualOptionGroup.addOption('<= cd ..', this.callOptionGroupFunction('mainMenuOptionGroup'));
102-
this.manualOptionGroup.addOption('./Packets.txt', this.callMenuFunction('DSNdisplay'));
103100
this.manualOptionGroup.addOption('./DSN.txt', this.callMenuFunction('Manual_DNS'));
104101
this.manualOptionGroup.addOption('./Mars.txt', this.callMenuFunction('Manual_Mars'));
105102
this.manualOptionGroup.addOption('./Spacecrafts.txt', this.callMenuFunction('Manual_Spacecraft'));
106-
this.manualOptionGroup.addOption('./WAP.txt', this.callMenuFunction('DSNdisplay'));
107-
this.manualOptionGroup.addOption('./Entanglement.txt', this.callMenuFunction('DSNdisplay'));
108103
}
109104

110105
build() {

0 commit comments

Comments
 (0)