Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
plante-qui-pleure
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Container Registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor 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
Puissegur Alexis
plante-qui-pleure
Commits
0f5f9cc1
Commit
0f5f9cc1
authored
6 years ago
by
Puissegur Alexis
Browse files
Options
Downloads
Patches
Plain Diff
okkk
parent
b52a8915
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
app/src/Util/CalendarUtil.java
+1
-48
1 addition, 48 deletions
app/src/Util/CalendarUtil.java
app/src/Vue/FXMLVueController.java
+1
-1
1 addition, 1 deletion
app/src/Vue/FXMLVueController.java
with
2 additions
and
49 deletions
app/src/Util/CalendarUtil.java
+
1
−
48
View file @
0f5f9cc1
...
...
@@ -32,54 +32,7 @@ public class CalendarUtil {
return
false
;
}
// check if 4th of July
if
(
cal
.
get
(
Calendar
.
MONTH
)
==
Calendar
.
JULY
&&
cal
.
get
(
Calendar
.
DAY_OF_MONTH
)
==
4
)
{
return
false
;
}
// check Thanksgiving (4th Thursday of November)
if
(
cal
.
get
(
Calendar
.
MONTH
)
==
Calendar
.
NOVEMBER
&&
cal
.
get
(
Calendar
.
DAY_OF_WEEK_IN_MONTH
)
==
4
&&
cal
.
get
(
Calendar
.
DAY_OF_WEEK
)
==
Calendar
.
THURSDAY
)
{
return
false
;
}
// check Memorial Day (last Monday of May)
if
(
cal
.
get
(
Calendar
.
MONTH
)
==
Calendar
.
MAY
&&
cal
.
get
(
Calendar
.
DAY_OF_WEEK
)
==
Calendar
.
MONDAY
&&
cal
.
get
(
Calendar
.
DAY_OF_MONTH
)
>
(
31
-
7
)
)
{
return
false
;
}
// check Labor Day (1st Monday of September)
if
(
cal
.
get
(
Calendar
.
MONTH
)
==
Calendar
.
SEPTEMBER
&&
cal
.
get
(
Calendar
.
DAY_OF_WEEK_IN_MONTH
)
==
1
&&
cal
.
get
(
Calendar
.
DAY_OF_WEEK
)
==
Calendar
.
MONDAY
)
{
return
false
;
}
// check President's Day (3rd Monday of February)
if
(
cal
.
get
(
Calendar
.
MONTH
)
==
Calendar
.
FEBRUARY
&&
cal
.
get
(
Calendar
.
DAY_OF_WEEK_IN_MONTH
)
==
3
&&
cal
.
get
(
Calendar
.
DAY_OF_WEEK
)
==
Calendar
.
MONDAY
)
{
return
true
;
}
// check Veterans Day (November 11)
if
(
cal
.
get
(
Calendar
.
MONTH
)
==
Calendar
.
NOVEMBER
&&
cal
.
get
(
Calendar
.
DAY_OF_MONTH
)
==
11
)
{
return
true
;
}
// check MLK Day (3rd Monday of January)
if
(
cal
.
get
(
Calendar
.
MONTH
)
==
Calendar
.
JANUARY
&&
cal
.
get
(
Calendar
.
DAY_OF_WEEK_IN_MONTH
)
==
3
&&
cal
.
get
(
Calendar
.
DAY_OF_WEEK
)
==
Calendar
.
MONDAY
)
{
return
true
;
}
// IF NOTHING ELSE, IT'S A BUSINESS DAY
return
true
;
}
}
}
This diff is collapsed.
Click to expand it.
app/src/Vue/FXMLVueController.java
+
1
−
1
View file @
0f5f9cc1
...
...
@@ -313,7 +313,7 @@ public class FXMLVueController implements Initializable, Observer {
computeGravity
();
}
else
{
System
.
out
.
println
(
"is not"
);
// send mail
// send mail
, not this
computeGravity
();
}
}
...
...
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