Continous_Integration_in_der_Praxis
/
CIiP-2019-SoSe-Projektarbeit_Alpha
forked from Hauch/Alpha
2
0
Fork 0
Code Releases Activity
Browse Source

Der neunte Commit. Textfelder zu den Fragen wurden eingefügt

master
MSeibert97 5 years ago
parent
dc240fd905
commit
0bac8e4d72
2 changed files with 35 additions and 10 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 24
      .idea/workspace.xml
  2. 21
      src/FitnessTest_M.java

24
.idea/workspace.xml
View File

@ -32,8 +32,8 @@
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/FitnessTest_M.java"> <entry file="file://$PROJECT_DIR$/src/FitnessTest_M.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="423">
<caret line="116" column="35" lean-forward="true" selection-start-line="116" selection-start-column="35" selection-end-line="116" selection-end-column="35" />
<state relative-caret-position="351">
<caret line="118" column="33" selection-start-line="118" selection-start-column="33" selection-end-line="118" selection-end-column="33" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
<element signature="e#5244#5245#0" expanded="true" /> <element signature="e#5244#5245#0" expanded="true" />
@ -477,7 +477,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1563276255706</updated> <updated>1563276255706</updated>
</task> </task>
<option name="localTasksCounter" value="30" />
<task id="LOCAL-00030" summary="Der achte Commit. Neue Fitnessfragen sollen entworfen&#10;werden. Die Fragen (Labels) wurden erstellt und&#10;positioniert.">
<created>1563277634769</created>
<option name="number" value="00030" />
<option name="presentableId" value="LOCAL-00030" />
<option name="project" value="LOCAL" />
<updated>1563277634769</updated>
</task>
<option name="localTasksCounter" value="31" />
<servers /> <servers />
</component> </component>
<component name="TestHistory"> <component name="TestHistory">
@ -497,7 +504,7 @@
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
<layout> <layout>
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.17270789" />
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.17270789" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" /> <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Image Layers" order="2" /> <window_info id="Image Layers" order="2" />
<window_info id="Designer" order="3" /> <window_info id="Designer" order="3" />
@ -507,7 +514,7 @@
<window_info anchor="bottom" id="Messages" order="0" sideWeight="0.49635628" weight="0.3268206" /> <window_info anchor="bottom" id="Messages" order="0" sideWeight="0.49635628" weight="0.3268206" />
<window_info anchor="bottom" id="Message" order="1" /> <window_info anchor="bottom" id="Message" order="1" />
<window_info anchor="bottom" id="Find" order="2" weight="0.3290461" /> <window_info anchor="bottom" id="Find" order="2" weight="0.3290461" />
<window_info anchor="bottom" id="Run" order="3" sideWeight="0.49840087" visible="true" weight="0.1744312" />
<window_info active="true" anchor="bottom" id="Run" order="3" sideWeight="0.49840087" visible="true" weight="0.1744312" />
<window_info anchor="bottom" id="Debug" order="4" weight="0.3997344" /> <window_info anchor="bottom" id="Debug" order="4" weight="0.3997344" />
<window_info anchor="bottom" id="Cvs" order="5" weight="0.25" /> <window_info anchor="bottom" id="Cvs" order="5" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="6" weight="0.4" /> <window_info anchor="bottom" id="Inspection" order="6" weight="0.4" />
@ -589,7 +596,8 @@
<MESSAGE value="Der fünfte Commit. Es gibt nun unterschiedliche PopUp Fenster, die von dem Wert des BMI's abhängen." /> <MESSAGE value="Der fünfte Commit. Es gibt nun unterschiedliche PopUp Fenster, die von dem Wert des BMI's abhängen." />
<MESSAGE value="Der sechste Commit. Der Bmi wird jetzt per Funktion berechnet, damit&#10;diese auch für Testzwecke verwendet werden kann. auch wurde eine&#10;Testklasse erstellt mit einem Testfall." /> <MESSAGE value="Der sechste Commit. Der Bmi wird jetzt per Funktion berechnet, damit&#10;diese auch für Testzwecke verwendet werden kann. auch wurde eine&#10;Testklasse erstellt mit einem Testfall." />
<MESSAGE value="Der siebte Commit. Weitere Testfälle." /> <MESSAGE value="Der siebte Commit. Weitere Testfälle." />
<option name="LAST_COMMIT_MESSAGE" value="Der siebte Commit. Weitere Testfälle." />
<MESSAGE value="Der achte Commit. Neue Fitnessfragen sollen entworfen&#10;werden. Die Fragen (Labels) wurden erstellt und&#10;positioniert." />
<option name="LAST_COMMIT_MESSAGE" value="Der achte Commit. Neue Fitnessfragen sollen entworfen&#10;werden. Die Fragen (Labels) wurden erstellt und&#10;positioniert." />
</component> </component>
<component name="com.intellij.coverage.CoverageDataManagerImpl"> <component name="com.intellij.coverage.CoverageDataManagerImpl">
<SUITE FILE_PATH="coverage/Alpha_GOGS$Main.ic" NAME="Main Coverage Results" MODIFIED="1563229577210" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" /> <SUITE FILE_PATH="coverage/Alpha_GOGS$Main.ic" NAME="Main Coverage Results" MODIFIED="1563229577210" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" />
@ -694,8 +702,8 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/FitnessTest_M.java"> <entry file="file://$PROJECT_DIR$/src/FitnessTest_M.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="423">
<caret line="116" column="35" lean-forward="true" selection-start-line="116" selection-start-column="35" selection-end-line="116" selection-end-column="35" />
<state relative-caret-position="351">
<caret line="118" column="33" selection-start-line="118" selection-start-column="33" selection-end-line="118" selection-end-column="33" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
<element signature="e#5244#5245#0" expanded="true" /> <element signature="e#5244#5245#0" expanded="true" />

21
src/FitnessTest_M.java
View File

@ -26,6 +26,10 @@ public class FitnessTest_M extends JFrame {
JLabel question_label2 = null; JLabel question_label2 = null;
JLabel question_label3 = null; JLabel question_label3 = null;
JLabel question_label4 = null; JLabel question_label4 = null;
JTextField question_tf1 = null;
JTextField question_tf2 = null;
JTextField question_tf3 = null;
JTextField question_tf4 = null;
public FitnessTest_M() { public FitnessTest_M() {
frame = new JFrame("Fitness Test"); frame = new JFrame("Fitness Test");
@ -103,9 +107,18 @@ public class FitnessTest_M extends JFrame {
question_label2 = new JLabel("Essen sie: \n A: 1-2 mal am Tag B: 3-4 mal am Tag C: 5+ mal am Tag"); question_label2 = new JLabel("Essen sie: \n A: 1-2 mal am Tag B: 3-4 mal am Tag C: 5+ mal am Tag");
question_label2.setBounds(1170, 10, 500, 60); question_label2.setBounds(1170, 10, 500, 60);
question_label3 = new JLabel("Rauchen sie?: \n A: Sehr oft B: Ab und zu C: Nie"); question_label3 = new JLabel("Rauchen sie?: \n A: Sehr oft B: Ab und zu C: Nie");
question_label3.setBounds(510, 120, 500, 60);
question_label3.setBounds(510, 150, 500, 60);
question_label4 = new JLabel("Trinken sie regelmässig Alkohol?: \n A: Sehr oft B: Ab und zu C: Nie"); question_label4 = new JLabel("Trinken sie regelmässig Alkohol?: \n A: Sehr oft B: Ab und zu C: Nie");
question_label4.setBounds(10, 120, 500, 60);
question_label4.setBounds(10, 150, 500, 60);
question_tf1 = new JTextField(10);
question_tf1.setBounds(660, 70, 500, 30);
question_tf2 = new JTextField(10);
question_tf2.setBounds(1170, 70, 500, 30);
question_tf3 = new JTextField(10);
question_tf3.setBounds(520, 210, 500, 30);
question_tf4 = new JTextField(10);
question_tf4.setBounds(10, 210, 500, 30);
frame.add(height_label); frame.add(height_label);
@ -118,6 +131,10 @@ public class FitnessTest_M extends JFrame {
frame.add(question_label2); frame.add(question_label2);
frame.add(question_label3); frame.add(question_label3);
frame.add(question_label4); frame.add(question_label4);
frame.add(question_tf1);
frame.add(question_tf2);
frame.add(question_tf3);
frame.add(question_tf4);
bmi_rechnen = new JButton("BMI berechnen"); bmi_rechnen = new JButton("BMI berechnen");
bmi_rechnen.setBounds(200, 90, 200, 30); bmi_rechnen.setBounds(200, 90, 200, 30);

Write Preview
Loading…
Cancel
Save