Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
ohj2
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
idmahako
ohj2
Commits
3acfc86b
Commit
3acfc86b
authored
2 years ago
by
Koivisto Ida Maria Hannuntytär
Browse files
Options
Downloads
Patches
Plain Diff
uusen lisaaminen
parent
0d0f7f95
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/rekisteri/RalliGUIController.java
+3
-4
3 additions, 4 deletions
src/rekisteri/RalliGUIController.java
src/rekisteri/uusi.fxml
+3
-3
3 additions, 3 deletions
src/rekisteri/uusi.fxml
with
6 additions
and
7 deletions
src/rekisteri/RalliGUIController.java
+
3
−
4
View file @
3acfc86b
...
...
@@ -54,7 +54,7 @@ public class RalliGUIController implements Initializable {
* Ajetaan kun klikataan "Muokkaa". Avaa uuden ikkunan, missä valitun henkilön tai rallin tietoja voi muokata
*/
@FXML
private
void
handleMuokkaa
()
{
ModalController
.
showModal
(
RalliGUIController
.
class
.
getResource
(
"HenkiloDialogView.fxml"
),
"Henkilo"
,
null
,
""
);
muokkaa
(
);
}
/**
...
...
@@ -145,8 +145,7 @@ public class RalliGUIController implements Initializable {
*
*/
public
void
lisaaUusi
(){
Dialogs
.
showMessageDialog
(
"Avataan uuden lisääminen, ei toimi vielä"
);
//ModalController.showModal(RalliGUIController.class.getResource("uusi.fxml"), "", null, "");
ModalController
.
showModal
(
RalliGUIController
.
class
.
getResource
(
"uusi.fxml"
),
"Lisää uusi"
,
null
,
""
);
//Henkilo uusi new Henkilo();
//uusi.rekisteroi();
//uusi.vastaaKalleRovanpera(); //täyttää kallerovanperä tiedoilla
...
...
@@ -162,7 +161,7 @@ public class RalliGUIController implements Initializable {
*
*/
public
void
muokkaa
()
{
Dialogs
.
showMe
ss
a
ge
Dialog
(
"Muokkaukseen, ei toimi vielä!
"
);
ModalController
.
showModal
(
RalliGUIController
.
cla
ss
.
ge
tResource
(
"HenkiloDialogView.fxml"
),
"Muokkaa tietoja"
,
null
,
"
"
);
}
/**
...
...
This diff is collapsed.
Click to expand it.
src/rekisteri/uusi.fxml
+
3
−
3
View file @
3acfc86b
...
...
@@ -19,7 +19,7 @@
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.RowConstraints?>
<BorderPane
maxHeight=
"-Infinity"
maxWidth=
"-Infinity"
minHeight=
"-Infinity"
minWidth=
"-Infinity"
prefHeight=
"400.0"
prefWidth=
"600.0"
xmlns=
"http://javafx.com/javafx/19"
xmlns:fx=
"http://javafx.com/fxml/1"
fx:controller=
"
rekisteri.RalliGUI
Controller"
>
<BorderPane
maxHeight=
"-Infinity"
maxWidth=
"-Infinity"
minHeight=
"-Infinity"
minWidth=
"-Infinity"
prefHeight=
"400.0"
prefWidth=
"600.0"
xmlns=
"http://javafx.com/javafx/19"
xmlns:fx=
"http://javafx.com/fxml/1"
fx:controller=
"
fi.jyu.mit.fxgui.Modal
Controller"
>
<center>
<TabPane
prefHeight=
"200.0"
prefWidth=
"200.0"
tabClosingPolicy=
"UNAVAILABLE"
BorderPane.alignment=
"CENTER"
>
<tabs>
...
...
@@ -191,8 +191,8 @@
<Insets
bottom=
"10.0"
left=
"10.0"
right=
"10.0"
top=
"10.0"
/>
</BorderPane.margin>
<children>
<Button
mnemonicParsing=
"false"
onAction=
"#handle
Poistu
"
text=
"Peruuta"
/>
<Button
mnemonicParsing=
"false"
onAction=
"#handle
Tallenna
"
text=
"Tallenna"
/>
<Button
mnemonicParsing=
"false"
onAction=
"#handle
DefaultCancel
"
text=
"Peruuta"
/>
<Button
mnemonicParsing=
"false"
onAction=
"#handle
DefaultOK
"
text=
"Tallenna"
/>
</children>
</HBox>
</bottom>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment