Skip to content

Commit

Permalink
Supress Warnings on includeHTML
Browse files Browse the repository at this point in the history
  • Loading branch information
DidierMurilloF committed Oct 19, 2023
1 parent 4947d52 commit 65dc33a
Show file tree
Hide file tree
Showing 3 changed files with 110 additions and 66 deletions.
34 changes: 27 additions & 7 deletions R/app_ui.R
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,32 @@
#' @noRd
app_ui <- function(request) {
options(spinner.color="#2c7da3", spinner.color.background="#ffffff", spinner.size = 2)
# Add this at the beginning of your app
# Add this line at the beginning of your app, outside of the ui and server functions
#shiny::addResourcePath("res", system.file("app/www", package = "FielDHub"))
tagList(
golem_add_external_resources(),
#addResourcePath("www", system.file("app/www", package = "FielDHub")),
tags$head(tags$script(type="text/javascript", src = "corner.js")),
tags$head(tags$script(type="text/javascript", src= "shinybusy.js")),
#includeCSS(system.file("app/www/style.css", package = "FielDHub")),
fluidPage(theme = shinythemes::shinytheme("flatly"),
navbarPage(title = "FielDHub v1.3.4",
tabPanel(" Welcome!", icon = icon("home", lib = "glyphicon"),
htmltools::includeHTML(
system.file("app/www/home.html", package = "FielDHub")
)
tabPanel(
" Welcome!", icon = icon("home", lib = "glyphicon"),
suppressWarnings(
htmltools::includeHTML(
system.file("app/www/home.html", package = "FielDHub")
)
)
),
# tabPanel(" Welcome!",
# icon = icon("home", lib = "glyphicon"),
# tags$iframe(
# src = "res/home.html",
# width = "100%", # Adjust width and height as necessary
# height = "1000px"
# )
# ),
navbarMenu("Unreplicated Designs",
tabPanel("Single Diagonal Arrangement",
mod_Diagonal_ui("Diagonal_ui_1")
Expand Down Expand Up @@ -92,15 +106,21 @@ app_ui <- function(request) {
)
),
navbarMenu("More",
tabPanel("Help",
tabPanel(
"Help",
suppressWarnings(
htmltools::includeHTML(
system.file("app/www/Help.html", package = "FielDHub")
)
)
),
tabPanel("About Us",
tabPanel(
"About Us",
suppressWarnings(
htmltools::includeHTML(
system.file("app/www/aboutUs.html", package = "FielDHub")
)
)
),
),
),
Expand Down
4 changes: 2 additions & 2 deletions R/utils_pREP.R
Original file line number Diff line number Diff line change
Expand Up @@ -176,9 +176,9 @@ pREP <- function(
################### Optimization ##########################################
# Perform an optimization by using the function swap_pairs()
if (max(table(field_layout)) == 2) {
swap <- swap_pairs(X = field_layout, starting_dist = 3)
swap <- swap_pairs(X = field_layout, starting_dist = 3, stop_iter = 50)
} else {
swap <- swap_pairs(X = field_layout, starting_dist = 2)
swap <- swap_pairs(X = field_layout, starting_dist = 2, stop_iter = 50)
}
optim_layout <- swap$optim_design
dups <- table(as.vector(optim_layout))
Expand Down
138 changes: 81 additions & 57 deletions data/Lattice_Alpha_56_Treatments.csv
Original file line number Diff line number Diff line change
@@ -1,57 +1,81 @@
ENTRY,NAME
1,GYT-01
2,GYT-02
3,GYT-03
4,GYT-04
5,GYT-05
6,GYT-06
7,GYT-07
8,GYT-08
9,GYT-09
10,GYT-10
11,GYT-11
12,GYT-12
13,GYT-13
14,GYT-14
15,GYT-15
16,GYT-16
17,GYT-17
18,GYT-18
19,GYT-19
20,GYT-20
21,GYT-21
22,GYT-22
23,GYT-23
24,GYT-24
25,GYT-25
26,GYT-26
27,GYT-27
28,GYT-28
29,GYT-29
30,GYT-30
31,GYT-31
32,GYT-32
33,GYT-33
34,GYT-34
35,GYT-35
36,GYT-36
37,GYT-37
38,GYT-38
39,GYT-39
40,GYT-40
41,GYT-41
42,GYT-42
43,GYT-43
44,GYT-44
45,GYT-45
46,GYT-46
47,GYT-47
48,GYT-48
49,GYT-49
50,GYT-50
51,GYT-51
52,GYT-52
53,GYT-53
54,GYT-54
55,GYT-55
56,GYT-56
ENTRY,NAME
1,Gen-01
2,Gen-02
3,Gen-03
4,Gen-04
5,Gen-05
6,Gen-06
7,Gen-07
8,Gen-08
9,Gen-09
10,Gen-10
11,Gen-11
12,Gen-12
13,Gen-13
14,Gen-14
15,Gen-15
16,Gen-16
17,Gen-17
18,Gen-18
19,Gen-19
20,Gen-20
21,Gen-21
22,Gen-22
23,Gen-23
24,Gen-24
25,Gen-25
26,Gen-26
27,Gen-27
28,Gen-28
29,Gen-29
30,Gen-30
31,Gen-31
32,Gen-32
33,Gen-33
34,Gen-34
35,Gen-35
36,Gen-36
37,Gen-37
38,Gen-38
39,Gen-39
40,Gen-40
41,Gen-41
42,Gen-42
43,Gen-43
44,Gen-44
45,Gen-45
46,Gen-46
47,Gen-47
48,Gen-48
49,Gen-49
50,Gen-50
51,Gen-51
52,Gen-52
53,Gen-53
54,Gen-54
55,Gen-55
56,Gen-56
57,Gen-57
58,Gen-58
59,Gen-59
60,Gen-60
61,Gen-61
62,Gen-62
63,Gen-63
64,Gen-64
65,Gen-65
66,Gen-66
67,Gen-67
68,Gen-68
69,Gen-69
70,Gen-70
71,Gen-71
72,Gen-72
73,Gen-73
74,Gen-74
75,Gen-75
76,Gen-76
77,Gen-77
78,Gen-78
79,Gen-79
80,Gen-80

0 comments on commit 65dc33a

Please sign in to comment.