diff --git a/IRMARADASHBOARD/global.R b/IRMARADASHBOARD/global.R index 6679af3b52a39e630d74c27b887ebc5b2f6c85fa..cf7e52c8130ab43e01a1b2a093eb23da1f893249 100644 --- a/IRMARADASHBOARD/global.R +++ b/IRMARADASHBOARD/global.R @@ -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}') diff --git a/IRMARADASHBOARD/server.R b/IRMARADASHBOARD/server.R index b1fa0fcfd04255546e76ed310ad1b100f213ac63..676a0ce49d40e958996a52651d070f356142a004 100644 --- a/IRMARADASHBOARD/server.R +++ b/IRMARADASHBOARD/server.R @@ -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, { diff --git a/IRMARADASHBOARD/ui.R b/IRMARADASHBOARD/ui.R index 305a4e41f9117d6d3cb8584b10a2bc169d7130d9..d77bf60875a0b1d1ed3eaab16889ec866442f515 100644 --- a/IRMARADASHBOARD/ui.R +++ b/IRMARADASHBOARD/ui.R @@ -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", diff --git a/IRMARADASHBOARD/www/banner_update_1.jpg b/IRMARADASHBOARD/www/banner_update_1.jpg deleted file mode 100644 index b33abb3426944743afb10d2b88e8a4eebe18a4f2..0000000000000000000000000000000000000000 Binary files a/IRMARADASHBOARD/www/banner_update_1.jpg and /dev/null differ diff --git a/IRMARADASHBOARD/www/chat.Rds b/IRMARADASHBOARD/www/chat.Rds deleted file mode 100644 index 96d4772a7159011bf49b82a63411999eababed7c..0000000000000000000000000000000000000000 Binary files a/IRMARADASHBOARD/www/chat.Rds and /dev/null differ diff --git a/IRMARADASHBOARD/www/css/shinychat.css b/IRMARADASHBOARD/www/css/shinychat.css deleted file mode 100644 index 5210af823b71f9f491200dae9495c9ee9a6a2b24..0000000000000000000000000000000000000000 --- a/IRMARADASHBOARD/www/css/shinychat.css +++ /dev/null @@ -1,40 +0,0 @@ -#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%; -} diff --git a/IRMARADASHBOARD/www/s1.jpg b/IRMARADASHBOARD/www/s1.jpg deleted file mode 100644 index fcb14004ffa6c1447a04ac2d5487b7f1af1de8cd..0000000000000000000000000000000000000000 Binary files a/IRMARADASHBOARD/www/s1.jpg and /dev/null differ diff --git a/IRMARADASHBOARD/www/s2.jpg b/IRMARADASHBOARD/www/s2.jpg deleted file mode 100644 index 198b7f1c23f6333389c8f0402accdde0664fb552..0000000000000000000000000000000000000000 Binary files a/IRMARADASHBOARD/www/s2.jpg and /dev/null differ diff --git a/IRMARADASHBOARD/www/s3.jpg b/IRMARADASHBOARD/www/s3.jpg deleted file mode 100644 index 0658a6c21010f1acbf3c8cee3b7f8604a14a2f6c..0000000000000000000000000000000000000000 Binary files a/IRMARADASHBOARD/www/s3.jpg and /dev/null differ