jofaichow commited on
Commit
7fb33fd
1 Parent(s): 0eb13c3

various improvements in payout summary

Browse files
Files changed (1) hide show
  1. app/app.R +16 -14
app/app.R CHANGED
@@ -195,7 +195,7 @@ ui <- shinydashboardPlus::dashboardPage(
195
 
196
  column(6,
197
 
198
- markdown("## **Step 1 - Select Your Models**"),
199
 
200
  markdown("### First, click this ⬇"),
201
 
@@ -223,7 +223,7 @@ ui <- shinydashboardPlus::dashboardPage(
223
 
224
  column(6,
225
 
226
- markdown("## **Step 2 - Download Data**"),
227
 
228
  markdown("### Next, click this ⬇ (it may take a while)"),
229
 
@@ -251,8 +251,10 @@ ui <- shinydashboardPlus::dashboardPage(
251
 
252
  br(),
253
 
254
- h3(strong(textOutput(outputId = "text_next"))),
255
- h3(strong(textOutput(outputId = "text_soon")))
 
 
256
 
257
  )
258
  ),
@@ -267,7 +269,7 @@ ui <- shinydashboardPlus::dashboardPage(
267
 
268
  markdown("# **Payout Summary**"),
269
  markdown("### Remember to refresh the charts after making changes to model selection or settings below."),
270
- markdown("### **NOTE**: the charts will take a while to render if you have selected a lot of models."),
271
 
272
  br(),
273
 
@@ -275,7 +277,7 @@ ui <- shinydashboardPlus::dashboardPage(
275
 
276
  column(6,
277
 
278
- markdown("## **Step 1 - Define the Range**"),
279
 
280
  sliderInput(inputId = "range_round",
281
  label = "Numerai Classic Tournament Rounds",
@@ -289,7 +291,7 @@ ui <- shinydashboardPlus::dashboardPage(
289
 
290
  column(6,
291
 
292
- markdown("## **Step 2 - Visualise**"),
293
  br(),
294
  actionBttn(inputId = "button_filter",
295
  label = "Create / Refresh Charts",
@@ -354,7 +356,7 @@ ui <- shinydashboardPlus::dashboardPage(
354
  br()
355
 
356
  ),
357
-
358
 
359
  tabPanel("Payout Summary (Individual Models)",
360
 
@@ -462,7 +464,7 @@ ui <- shinydashboardPlus::dashboardPage(
462
  fluidRow(
463
  column(10,
464
  htmltools::includeMarkdown('https://raw.githubusercontent.com/councilofelders/meetups/master/README.md')
465
- )
466
  )
467
  # markdown("![image](https://media.giphy.com/media/cftSzNoCTfSyAWctcl/giphy.gif)")
468
  ),
@@ -552,11 +554,11 @@ server <- function(input, output) {
552
  })
553
 
554
  output$text_next <- renderText({
555
- if (length(react_ls_model()) >= 1) " [NEW] Payout Summary and Raw Data 📊💸" else " "
556
  })
557
 
558
- output$text_soon <- renderText({
559
- if (length(react_ls_model()) >= 1) " [COMING SOON] Model Performance 📈🔥" else " "
560
  })
561
 
562
  react_d_raw <- eventReactive(
@@ -702,7 +704,7 @@ server <- function(input, output) {
702
  avg_rate_of_return_percent = mean(rate_of_return_percent, na.rm = T),
703
  sharpe_rate_of_return = mean(rate_of_return_percent, na.rm = T) / sd(rate_of_return_percent, na.rm = T)
704
  ) |> as.data.table()
705
-
706
  # Return
707
  d_smry
708
 
@@ -729,7 +731,7 @@ server <- function(input, output) {
729
  })
730
 
731
  output$text_payout_all_models <- renderText({
732
- if (nrow(react_d_filter()) >= 1) "Payout Summary Chart (Stacked)" else " "
733
  })
734
 
735
  output$text_payout_ind_models <- renderText({
 
195
 
196
  column(6,
197
 
198
+ markdown("## **Step 1: Select Your Models**"),
199
 
200
  markdown("### First, click this ⬇"),
201
 
 
223
 
224
  column(6,
225
 
226
+ markdown("## **Step 2: Download Data**"),
227
 
228
  markdown("### Next, click this ⬇ (it may take a while)"),
229
 
 
251
 
252
  br(),
253
 
254
+ h2(strong(textOutput(outputId = "text_next"))),
255
+ h3(textOutput(outputId = "text_note")),
256
+
257
+ br()
258
 
259
  )
260
  ),
 
269
 
270
  markdown("# **Payout Summary**"),
271
  markdown("### Remember to refresh the charts after making changes to model selection or settings below."),
272
+ markdown("### **NOTE**: the charts may take a while to render if you have selected a lot of models."),
273
 
274
  br(),
275
 
 
277
 
278
  column(6,
279
 
280
+ markdown("## **Step 4: Define the Range**"),
281
 
282
  sliderInput(inputId = "range_round",
283
  label = "Numerai Classic Tournament Rounds",
 
291
 
292
  column(6,
293
 
294
+ markdown("## **Step 5: Plot**"),
295
  br(),
296
  actionBttn(inputId = "button_filter",
297
  label = "Create / Refresh Charts",
 
356
  br()
357
 
358
  ),
359
+
360
 
361
  tabPanel("Payout Summary (Individual Models)",
362
 
 
464
  fluidRow(
465
  column(10,
466
  htmltools::includeMarkdown('https://raw.githubusercontent.com/councilofelders/meetups/master/README.md')
467
+ )
468
  )
469
  # markdown("![image](https://media.giphy.com/media/cftSzNoCTfSyAWctcl/giphy.gif)")
470
  ),
 
554
  })
555
 
556
  output$text_next <- renderText({
557
+ if (length(react_ls_model()) >= 1) "Step 3: Payout Summary (see ←)" else " "
558
  })
559
 
560
+ output$text_note <- renderText({
561
+ if (length(react_ls_model()) >= 1) "Note: you can also download [Raw Data] and check out our [Community Events] (see ←)" else " "
562
  })
563
 
564
  react_d_raw <- eventReactive(
 
704
  avg_rate_of_return_percent = mean(rate_of_return_percent, na.rm = T),
705
  sharpe_rate_of_return = mean(rate_of_return_percent, na.rm = T) / sd(rate_of_return_percent, na.rm = T)
706
  ) |> as.data.table()
707
+
708
  # Return
709
  d_smry
710
 
 
731
  })
732
 
733
  output$text_payout_all_models <- renderText({
734
+ if (nrow(react_d_filter()) >= 1) "Payout Summary Chart (All Models - Stacked)" else " "
735
  })
736
 
737
  output$text_payout_ind_models <- renderText({