Commit a7459ff7 authored by QUAN VAN DAU's avatar QUAN VAN DAU
Browse files

Adding the return Period and threshold values in to the interactive boxes....

Adding the return Period and threshold values in to the interactive boxes. Removed Map page in the Control Panel.
Pipeline #20273 passed with stage
in 37 seconds
Showing with 39 additions and 45 deletions
+39 -45
......@@ -7,7 +7,6 @@ HomePage <- readRDS("www/homePage.Rds")
AboutPage <- readRDS("www/aboutPage.Rds")
Yearperiod <- readRDS("www/returnPeriod.Rds")
####################################CONFIGRATION################################
......@@ -324,6 +323,29 @@ heading <- function(x) {
background = "olive"
)
),
column(
2,
offset = 0,
shinydashboard::box(
htmlOutput("h_return"),
tags$style("#h_return{font-size: 12px;font-style: regular;}"),
htmlOutput("return"),
tags$style("#return{font-size: 16px;font-style: bold;}"),
width = "100%",
collapsible = T,
background = "red"
),
shinydashboard::box(
htmlOutput("h_thres"),
tags$style("#h_thres{font-size: 12px;font-style: regular;}"),
htmlOutput("thres"),
tags$style("#thres{font-size: 42px;font-style: bold;}"),
width = "100%",
collapsible = T,
background = "green"
)
),
tags$style('.box-body {margin-top: -20px}'),
tags$style('.btn-box-tool {font-size: 5px; color: white}')
......
......@@ -603,6 +603,20 @@ function(input, output, session) {
}
########################STATISTIC ##########################################
output$h_thres <- renderText({
"Threshold"
})
output$thres <- renderText({
paste0(req(RThreshold), " m<sup>3</sup>/s")
})
output$h_return <- renderText({
"Return Period"
})
output$return <- renderText({
paste0("T = ", req(FReturnP), " /")
})
output$size <- renderText({
"Data Size"
})
......@@ -849,6 +863,8 @@ function(input, output, session) {
title = "Saved !!",
type = "success")
})
#Account Page
observeEvent(input$saveAccount,
{
......
......@@ -368,7 +368,6 @@ dashboardPage(
div(h5(HomePage[2]),
h5(HomePage[3]),
h5(HomePage[4]))),
column(7)),
fluidRow(style = "height:140px;"),
......@@ -972,11 +971,8 @@ dashboardPage(
actionButton("saveAboutTool", "SAVE", icon("save")
)
), # Tab Tool
tabPanel("MapPage", h3("Modifying the MapPage"),icon= icon("map-marked-alt")
),
tabPanel("Account", h3("Your Account"),icon= icon("id-card"),
icon("user-alt", "fa-4x"), align = "center",
......
IRMARADASHBOARD/www/banner_update_1.jpg

200 KB

File deleted
#chat {
padding: .5em;
border: 1px solid #777;
height: 300px;
overflow-y: scroll;
}
.user-change, .user-exit, .user-enter {
color: #aaa;
font-size: .8em;
}
.username {
font-weight: bold;
color: #226;
}
#entry {
width: 100%;
}
.center {
text-align :center;
padding-top: 3px;
}
#play-nice {
color: #AAA;
text-align: right;
padding: 30px 0;
}
html, body {
height: 100%;
}
.fill {
min-height: 100%;
height: 100%;
}
IRMARADASHBOARD/www/s1.jpg

145 KB

IRMARADASHBOARD/www/s2.jpg

158 KB

IRMARADASHBOARD/www/s3.jpg

147 KB

Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment