update marge

This commit is contained in:
Rafał Piskorski 2021-01-07 14:23:35 +01:00
commit ce5d63b0e7
8 changed files with 41 additions and 119 deletions

BIN
Dokumentacja.pdf Normal file

Binary file not shown.

View File

@ -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

View File

@ -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")
}

View File

@ -9,7 +9,6 @@ params:
p: NA
r: NA
z: NA
y: NA
---
Wiek pacjenta(w latach):

View File

@ -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}

Binary file not shown.

View File

@ -2,14 +2,15 @@
<project version="4">
<component name="CompilerConfiguration">
<annotationProcessing>
<profile default="true" name="Default" enabled="true" />
<profile name="Maven default annotation processors profile" enabled="true">
<sourceOutputDir name="target/generated-sources/annotations" />
<sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
<outputRelativeToContentRoot value="true" />
<module name="TakeCareApp_Backend" />
<module name="TAS_Project" />
<module name="TAS_Projekt-backend-branch" />
<module name="backend" />
<module name="TakeCareApp_Backend" />
</profile>
</annotationProcessing>
<bytecodeTargetLevel>

View File

@ -4,9 +4,7 @@
<option name="autoReloadType" value="SELECTIVE" />
</component>
<component name="ChangeListManager">
<list default="true" id="2f11f4d5-1593-4266-846c-71ac633cf58a" name="Default" comment="">
<change beforePath="$PROJECT_DIR$/../app/calculator.R" beforeDir="false" afterPath="$PROJECT_DIR$/../app/calculator.R" afterDir="false" />
</list>
<list default="true" id="2f11f4d5-1593-4266-846c-71ac633cf58a" name="Default" comment="" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@ -26,13 +24,6 @@
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
</component>
<component name="MavenImportPreferences">
<option name="generalSettings">
<MavenGeneralSettings>
<option name="mavenHome" value="C:\software\intellij_idea\plugins\maven\lib\maven3" />
</MavenGeneralSettings>
</option>
</component>
<component name="ProjectCodeStyleSettingsMigration">
<option name="version" value="1" />
</component>
@ -43,6 +34,11 @@
<option name="showLibraryContents" value="true" />
</component>
<component name="PropertiesComponent">
<property name="ExpandSpringBootJavaOptionsPanel" value="true" />
<property name="RequestMappingsPanelOrder0" value="0" />
<property name="RequestMappingsPanelOrder1" value="1" />
<property name="RequestMappingsPanelWidth0" value="75" />
<property name="RequestMappingsPanelWidth1" value="75" />
<property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
<property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
<property name="WebServerToolWindowFactoryState" value="false" />
@ -53,9 +49,10 @@
<property name="project.structure.side.proportion" value="0.2" />
<property name="settings.editor.selected.configurable" value="project.propVCSSupport.Mappings" />
</component>
<component name="RunManager">
<component name="RunManager" selected="Application.TakeCareApp">
<configuration name="TakeCareApp" type="Application" factoryName="Application" nameIsGenerated="true">
<option name="ALTERNATIVE_JRE_PATH" value="11" />
<option name="ALTERNATIVE_JRE_PATH" value="$PROJECT_DIR$/../../../../../Program Files/Java/jre1.8.0_251" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
<option name="MAIN_CLASS_NAME" value="project.TakeCareApp" />
<module name="backend" />
<extension name="coverage">
@ -74,19 +71,6 @@
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration default="true" type="ArquillianTestNG" factoryName="" nameIsGenerated="true">
<option name="arquillianRunConfiguration">
<value>
<option name="containerStateName" value="" />
</value>
</option>
<option name="TEST_OBJECT" value="CLASS" />
<properties />
<listeners />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration default="true" type="JUnit" factoryName="JUnit">
<option name="TEST_OBJECT" value="class" />
<option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
@ -141,6 +125,15 @@
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="TakeCareApp" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
<module name="backend" />
<option name="SPRING_BOOT_MAIN_CLASS" value="project.TakeCareApp" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
<option name="ALTERNATIVE_JRE_PATH" value="11" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration default="true" type="TestNG">
<option name="TEST_OBJECT" value="CLASS" />
<option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
@ -150,6 +143,9 @@
<option name="Make" enabled="true" />
</method>
</configuration>
<list>
<item itemvalue="Application.TakeCareApp" />
</list>
</component>
<component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
<component name="SvnConfiguration">
@ -164,89 +160,15 @@
<updated>1538657724296</updated>
<workItem from="1608588877099" duration="112000" />
<workItem from="1608589030964" duration="1942000" />
<workItem from="1609941463740" duration="1226000" />
<workItem from="1609942732553" duration="90000" />
</task>
<servers />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
<is-autoscroll-to-source value="true" />
</todo-panel>
<todo-panel id="all">
<are-packages-shown value="true" />
<is-autoscroll-to-source value="true" />
</todo-panel>
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="3" />
</component>
<component name="WindowStateProjectService">
<state x="249" y="0" key="#Project_Structure" timestamp="1608590116186">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state x="249" y="0" key="#Project_Structure/0.0.1536.824@0.0.1536.824" timestamp="1608590116186" />
<state x="357" y="150" width="584" height="683" key="#TakeCareApp" timestamp="1608415357147">
<screen x="0" y="0" width="1280" height="984" />
</state>
<state x="357" y="150" width="584" height="683" key="#TakeCareApp/0.0.1280.984@0.0.1280.984" timestamp="1608415357147" />
<state x="223" y="0" width="1089" height="824" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1608590123302">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state x="223" y="0" width="1089" height="824" key="#com.intellij.execution.impl.EditConfigurationsDialog/0.0.1536.824@0.0.1536.824" timestamp="1608590123302" />
<state x="445" y="208" key="#com.intellij.ide.util.MemberChooser" timestamp="1608284675573">
<screen x="0" y="0" width="1280" height="984" />
</state>
<state x="445" y="208" key="#com.intellij.ide.util.MemberChooser/0.0.1280.984@0.0.1280.984" timestamp="1608284675573" />
<state x="498" y="221" key="#com.intellij.ide.util.TreeClassChooserDialog" timestamp="1608589130374">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state x="498" y="221" key="#com.intellij.ide.util.TreeClassChooserDialog/0.0.1536.824@0.0.1536.824" timestamp="1608589130374" />
<state x="515" y="359" key="#com.intellij.ide.util.projectWizard.JdkChooserPanel.MyDialog" timestamp="1608416401063">
<screen x="0" y="0" width="1280" height="984" />
</state>
<state x="515" y="359" key="#com.intellij.ide.util.projectWizard.JdkChooserPanel.MyDialog/0.0.1280.984@0.0.1280.984" timestamp="1608416401063" />
<state x="618" y="301" key="#com.intellij.ide.util.projectWizard.JdkChooserPanel.MyDialog/0.0.1536.824@0.0.1536.824" timestamp="1606136940050" />
<state x="370" y="239" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog" timestamp="1608284351336">
<screen x="0" y="0" width="1280" height="984" />
</state>
<state x="370" y="239" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog/0.0.1280.984@0.0.1280.984" timestamp="1608284351336" />
<state x="504" y="207" key="FileChooserDialogImpl" timestamp="1608588987971">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state x="420" y="247" key="FileChooserDialogImpl/0.0.1280.984@0.0.1280.984" timestamp="1608416486787" />
<state x="504" y="207" key="FileChooserDialogImpl/0.0.1536.824@0.0.1536.824" timestamp="1608588987971" />
<state width="1416" height="195" key="GridCell.Tab.0.bottom" timestamp="1608591962773">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state width="1237" height="144" key="GridCell.Tab.0.bottom/0.0.1280.984@0.0.1280.984" timestamp="1608474806471" />
<state width="1416" height="195" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1608591962773" />
<state width="1416" height="195" key="GridCell.Tab.0.center" timestamp="1608591962773">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state width="1237" height="144" key="GridCell.Tab.0.center/0.0.1280.984@0.0.1280.984" timestamp="1608474806471" />
<state width="1416" height="195" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1608591962773" />
<state width="1416" height="195" key="GridCell.Tab.0.left" timestamp="1608591962773">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state width="1237" height="144" key="GridCell.Tab.0.left/0.0.1280.984@0.0.1280.984" timestamp="1608474806471" />
<state width="1416" height="195" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1608591962773" />
<state width="1416" height="195" key="GridCell.Tab.0.right" timestamp="1608591962773">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state width="1237" height="144" key="GridCell.Tab.0.right/0.0.1280.984@0.0.1280.984" timestamp="1608474806471" />
<state width="1416" height="195" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1608591962773" />
<state x="231" y="66" key="SettingsEditor" timestamp="1608416474275">
<screen x="0" y="0" width="1280" height="984" />
</state>
<state x="231" y="66" key="SettingsEditor/0.0.1280.984@0.0.1280.984" timestamp="1608416474275" />
<state x="277" y="55" key="SettingsEditor/0.0.1536.824@0.0.1536.824" timestamp="1606136640031" />
<state x="336" y="316" key="com.intellij.ide.util.TipDialog" timestamp="1608473085786">
<screen x="0" y="0" width="1280" height="984" />
</state>
<state x="336" y="316" key="com.intellij.ide.util.TipDialog/0.0.1280.984@0.0.1280.984" timestamp="1608473085786" />
</component>
<component name="com.intellij.coverage.CoverageDataManagerImpl">
<SUITE FILE_PATH="coverage/backend$TakeCareApp.ic" NAME="TakeCareApp Coverage Results" MODIFIED="1608590180059" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">
<FILTER>project.*</FILTER>
</SUITE>
<SUITE FILE_PATH="coverage/backend$TakeCareApp.ic" NAME="TakeCareApp Coverage Results" MODIFIED="1609942793616" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" />
</component>
</project>