Ds 2577

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: flipFormat
 Type: Package
 Title: Formatting of R outputs
-Version: 1.3.3
+Version: 1.3.4
 Author: Displayr <opensource@displayr.com>
 Maintainer: Displayr <opensource@displayr.com>
 Description: Formatting to be used in print statements and other outputs. E.g.,

R/CreateChoiceModelDesignWidget.R

@@ -37,6 +37,7 @@ CreateChoiceModelDesignWidget <- function(x,
     ## add CSS
     addCss("table.css", cata)
     addCss("cmd.css", cata)
+    addCss("details.css", cata)
     if (!is.null(css))
       addCss(css, cata, in.css.folder = FALSE)
 

inst/css/cmd.css

@@ -9,34 +9,6 @@
     right: 0;
 }
 
-summary {
-    /* border-bottom: 3px solid #151A1C; */
-    background: #F2F5FA;
-    font-family: Circular, Circular-bold,"Helvetica Neue",Helvetica,Arial,sans-serif;
-    color: #151A1C;
-    font-size: 15px;
-    margin-top: 10px;
-    /* margin-bottom: 10px; */
-}
-
-@supports (-ms-ime-align:auto) {
-  .summary, .details {
-      /* border-bottom: 3px solid #151A1C; */
-      /* background: #F2F5FA; */
-      /* font-family: Circular, Circular-bold,"Helvetica Neue",Helvetica,Arial,sans-serif; */
-      /* color: #151A1C; */
-      /* font-size: 15px; */
-      /* margin-top: 10px; */
-      /* margin-bottom: 10px; */
-      display: block;
-  }
-}
-
-details summary::-webkit-details-marker{
-    color: #3E7DCC;
-    margin-left: 10px; /* so doesnt overlap with displayr resize tool */
-}
-
 h1 {
     text-align: left;
     font-family: Circular, Circular-bold,"Helvetica Neue",Helvetica,Arial,sans-serif;

inst/css/details.css

@@ -0,0 +1,32 @@
+summary {
+    /* border-bottom: 3px solid #151A1C; */
+    background: #F2F5FA;
+    font-family: Circular, Circular-bold,"Helvetica Neue",Helvetica,Arial,sans-serif;
+    color: #151A1C;
+    font-size: 16px;
+    margin-top: 10px;
+    user-select: none;
+    /* margin-bottom: 10px; */
+}
+
+@supports (-ms-ime-align:auto) {
+  .summary, .details {
+      /* border-bottom: 3px solid #151A1C; */
+      /* background: #F2F5FA; */
+      /* font-family: Circular, Circular-bold,"Helvetica Neue",Helvetica,Arial,sans-serif; */
+      /* color: #151A1C; */
+      /* font-size: 15px; */
+      /* margin-top: 10px; */
+      /* margin-bottom: 10px; */
+      display: block;
+  }
+}
+
+details summary::-webkit-details-marker{
+    color: #3E7DCC;
+    margin-left: 10px; /* so doesnt overlap with displayr resize tool */
+}
+
+.sub-details {
+  font-size: 14px;
+}

inst/css/textanalysis.css

@@ -3,11 +3,43 @@
 .main-container {
     width: 100%;
     height: 100%;
+}
+
+.vertical-container {
+    height: calc(100vh - 50px);
+    display: flex;
+    flex-direction: column;
+    flex-wrap: nowrap;
+    align-items: stretch;
+    overflow: auto;
+}
+
+.top-container {
+    width: 100%;
+    height: calc(100vh - 120px);
     display: flex;
     flex-direction: row;
     flex-wrap: nowrap;
-    justify-content: center;
     align-items: stretch;
+    overflow-x: auto;
+    padding-top: 10px;
+}
+
+.bottom-container {
+    overflow-y: scroll;
+    display: flex;
+}
+
+.bottom-container-full {
+    overflow-y: scroll;
+    display: flex;
+    height: 100%;
+}
+
+.bottom-container-half {
+    overflow-y: scroll;
+    display: flex;
+    height: 50%;
 }
 
 #footer-container {
@@ -16,13 +48,10 @@
 }
 
 #text-panel {
-    resize: horizontal;
-    height: calc(100vh - 50px);
     overflow-y: scroll;
     overflow-x: auto;
     min-width: 0;
-    flex: 1 1 70%
-
+    flex: 1 1 auto;
 }
 
 .raw-replacement {
@@ -35,10 +64,8 @@
     resize: horizontal;
     overflow-y: scroll;
     overflow-x: auto;
-    height: calc(100vh - 50px);
-    min-width: 0;
-    max-width: 50%;
-    /* flex 1 1 50% will make the panels a fixed width */
+    max-width: calc(50vw);
+    flex: 1 1 auto;
 }
 
 #footer-container {
@@ -77,3 +104,51 @@
     font-family: Circular, Circular-bold,"Helvetica Neue",Helvetica,Arial,sans-serif;
     font-size: 18px;
 }
+
+.diagnostics-title {
+    color: #3E7DCC;
+    font-size: 22px;
+    margin: 10px 15px 0 15px;
+    font-family: Circular, Circular-bold,"Helvetica Neue",Helvetica,Arial,sans-serif;
+}
+
+.diagnostics-container {
+    margin-top: 10px;
+    width: 100%;
+}
+
+.diagnostics-text {
+    display: block;
+}
+
+.diagnostics-table {
+    font-size: 12px;
+    margin-left: 10px;
+    margin-right: 10px;
+    margin-bottom: 20px;
+}
+
+.diagnostics-table td {
+    padding-left: 5px;
+    padding-right: 5px;
+    word-break: break-word; /* only break words in cells not table headers */
+    hyphens: auto;
+}
+
+.diagnostics-block {
+    display: flex;
+    border-bottom: solid 1px #BBB;
+}
+
+.diagnostics-group {
+    padding-top: 10px;
+}
+
+.diagnostics-message {
+    font-size: 12px;
+    margin-left: 10px;
+    margin-right: 10px;
+    margin-top: 5px;
+    margin-bottom: 10px;
+    color: #444;
+}

tests/testthat/test-createtextanalysiswidget.R

@@ -1,3 +1,9 @@
+findInstDirFile <- function(file)
+{
+  file.path(system.file("testdata", package = "flipFormat", mustWork = TRUE),
+            file)
+}
+
 raw.and.normalized.text <- list(`Original Text` = c("Aim to higlight ai. Raindrops on roses and whiskers on kittens",
   "Bright copper kettles and warm woolen mittens", "Brown paper packages tied up with strings",
   "These are a few of my favorite things", "Cream colored ponies and crisp apple streudels",
@@ -124,3 +130,12 @@ test_that("Text analysis output",
                                        token.substitution, footer)
     expect_is(result, "htmlwidget")
 })
+
+test_that("Raw text diagnostics",
+{
+    load(findInstDirFile("text.analysis.diagnostics.rda"))
+    result <- CreateTextAnalysisWidget(raw.and.normalized.text,
+                                       n.gram.frequencies,
+                                       token.substitution, footer,
+                                       text.analysis.diagnostics)
+})