diff --git a/Dokumentacja.pdf b/Dokumentacja.pdf new file mode 100644 index 0000000..a5c214d Binary files /dev/null and b/Dokumentacja.pdf differ diff --git a/app/calculator.R b/app/calculator.R index fb80654..41cee49 100644 --- a/app/calculator.R +++ b/app/calculator.R @@ -72,7 +72,7 @@ calculatorServer <- function(input, output, session) { } z=-5.3718+0.0354*as.numeric(input$slider1)+1.6159*as.numeric(input$select1)+1.1768*as.numeric(input$select2)+0.0697*p+0.9586*as.numeric(input$select3)-2.9486*as.numeric(input$select4) x=round(1/(1+exp(-z)),3) - params <- list(n = input$slider1,k=input$slider2,l=input$select1,m=input$select2,p=input$select3,r=input$select4,z=x,y=) + params <- list(n = input$slider1,k=input$slider2,l=input$select1,m=input$select2,p=input$select3,r=input$select4,z=x) # Knit the document, passing in the `params` list, and eval it in a # child of the global environment (this isolates the code in the document diff --git a/app/profil_module.R b/app/profil_module.R index df3826e..e53f77f 100644 --- a/app/profil_module.R +++ b/app/profil_module.R @@ -38,7 +38,7 @@ profilUI <- function(id) { fluidRow( column(12, - tags$span("© Copyright Wszystkie prawa zastrzeĹĽone."))%>% tagAppendAttributes(id = 'column-copyright'), + tags$span("Copyright Wszystkie prawa zastrzezone."))%>% tagAppendAttributes(id = 'column-copyright'), )%>% tagAppendAttributes(id = 'row-footer') @@ -120,7 +120,7 @@ profilServer <- function(input, output,session) { dateInput("editAge", label = strong("Data urodzenia") ,value=response$profil$datebirth), selectInput("editGender", label = strong("Plec"), - choices = list("żenska" = 0, "meska" = 1), + choices = list("Zenska" = 0, "meska" = 1), selected = as.numeric(response$profil$gender)), ), @@ -160,10 +160,10 @@ profilServer <- function(input, output,session) { tabsetPanel(type = "tabs", tabPanel("Dane profilowe", tags$div(uiOutput("profileData") )%>% tagAppendAttributes(class = 'content-wrapper')), - tabPanel("ZakĹ‚adka 2", tags$div(plotlyOutput("plot2",height = "auto"))%>% tagAppendAttributes(class = 'content-wrapper')), - tabPanel("ZakĹ‚adka 3", tags$div(plotlyOutput("plot3",height = "auto"))%>% tagAppendAttributes(class = 'content-wrapper')), - tabPanel("ZakĹ‚adka 4", tags$div(plotlyOutput("plot4",height = "auto"))%>% tagAppendAttributes(class = 'content-wrapper')), - tabPanel("ZakĹ‚adka 5", tags$div(DT::dataTableOutput("table1",height = "auto"))%>% tagAppendAttributes(class = 'content-wrapper')) + tabPanel("Zakladka 2", tags$div(plotlyOutput("plot2",height = "auto"))%>% tagAppendAttributes(class = 'content-wrapper')), + tabPanel("Zakladka 3", tags$div(plotlyOutput("plot3",height = "auto"))%>% tagAppendAttributes(class = 'content-wrapper')), + tabPanel("Zakladka 4", tags$div(plotlyOutput("plot4",height = "auto"))%>% tagAppendAttributes(class = 'content-wrapper')), + tabPanel("Zakladka 5", tags$div(DT::dataTableOutput("table1",height = "auto"))%>% tagAppendAttributes(class = 'content-wrapper')) ))%>% tagAppendAttributes(id = 'column-content') ) %>% tagAppendAttributes(id = 'row-content') @@ -222,13 +222,13 @@ profilServer <- function(input, output,session) { pl <- list( sSearch = "Szukaj", - sInfo="Wyniki od _START_ do _END_ z _TOTAL_ rekordĂłw", - sZeroRecords="Brak rekordĂłw", + sInfo="Wyniki od _START_ do _END_ z _TOTAL_ rekordow", + sZeroRecords="Brak rekordow", sEmptyTable="Pusta tabela", oPaginate= list( - sFirst="Pierwsza", sPrevious="Poprzednia",sLast="Ostatnia", sNext="NastÄ™pna" + sFirst="Pierwsza", sPrevious="Poprzednia",sLast="Ostatnia", sNext="Nastepna" ), - sLengthMenu = "PokaĹĽ _MENU_ rekordĂłw na stronie" + sLengthMenu = "Pokaz _MENU_ rekordow na stronie" ) output$table1 <- DT::renderDataTable(iris,options = list(scrollX = TRUE,language=pl)) @@ -251,7 +251,7 @@ profilServer <- function(input, output,session) { if (s=="" | grepl("^[A-Z][a-zA-ZĄąĆćĘꣳŃńÓ󌜏źŻż]{2,15}$",s)==TRUE){ return() }else{ - p("BĹ‚ad: Imie powinno zaczynac sie od wielkiej litery, zawierac jedynie litery i miec dlugosc od 3 do 15 znakĂłw",style="color:yellow") + p("Blad: Imie powinno zaczynac sie od wielkiej litery, zawierac jedynie litery i miec dlugosc od 3 do 15 znakow",style="color:yellow") } }) @@ -262,7 +262,7 @@ profilServer <- function(input, output,session) { if (s=="" | grepl("^[A-Z][a-zA-ZĄąĆćĘꣳŃńÓ󌜏źŻż]{2,20}$",s)==TRUE){ return() }else{ - p("BĹ‚ad: Nazwisko powinno zaczynac sie od wielkiej litery, zawierac jedynie litery i miec dlugosc od 3 do 15 znaków",style="color:yellow") + p("Blad: Nazwisko powinno zaczynac sie od wielkiej litery, zawierac jedynie litery i miec dlugosc od 3 do 15 znaków",style="color:yellow") } @@ -275,7 +275,7 @@ profilServer <- function(input, output,session) { if (s=="" | grepl("^[a-z]+[0-9]*@([a-z]{2,10}\\.)+[a-z]{2,5}$",s)==TRUE){ return() }else{ - p("BĹ‚ad: Mail powinien miec budowe adres@nazwa.domena",style="color:yellow") + p("Blad: Mail powinien miec budowe adres@nazwa.domena",style="color:yellow") } diff --git a/app/report.Rmd b/app/report.Rmd index 5caf2c8..69ba586 100644 --- a/app/report.Rmd +++ b/app/report.Rmd @@ -9,7 +9,6 @@ params: p: NA r: NA z: NA - y: NA --- Wiek pacjenta(w latach): diff --git a/app/report.aux b/app/report.aux index 62837d9..50551d9 100644 --- a/app/report.aux +++ b/app/report.aux @@ -1,6 +1,5 @@ \relax \providecommand\hyper@newdestlabel[2]{} -\providecommand\BKM@entry[2]{} \providecommand\HyperFirstAtBeginDocument{\AtBeginDocument} \HyperFirstAtBeginDocument{\ifx\hyper@anchor\@undefined \global\let\oldcontentsline\contentsline @@ -17,3 +16,4 @@ \gdef\HyperFirstAtBeginDocument#1{#1} \providecommand\HyField@AuxAddToFields[1]{} \providecommand\HyField@AuxAddToCoFields[2]{} +\gdef \@abspage@last{1} diff --git a/app/report.pdf b/app/report.pdf index b467f59..ebd6ec2 100644 Binary files a/app/report.pdf and b/app/report.pdf differ diff --git a/backend/.idea/compiler.xml b/backend/.idea/compiler.xml index 6fd036f..c665e75 100644 --- a/backend/.idea/compiler.xml +++ b/backend/.idea/compiler.xml @@ -2,14 +2,15 @@ + - + diff --git a/backend/.idea/workspace.xml b/backend/.idea/workspace.xml index ddf045a..19108ce 100644 --- a/backend/.idea/workspace.xml +++ b/backend/.idea/workspace.xml @@ -4,9 +4,7 @@ - - - + + + + + + @@ -53,9 +49,10 @@ - + - - - - + + + + + + @@ -164,89 +160,15 @@ 1538657724296 + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - project.* - + \ No newline at end of file