Increment version number to 1.0.3

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: AVSDevR.MarineNoiseRegistry
 Title: Marine Noise Registry Common Code Package
-Version: 1.0.0.9000
+Version: 1.0.3
 Authors@R: 
     person("Craig", "Williams", , "craig@avsdev.uk", role = c("aut", "cre"))
 Description: Comon code and assets for all of the Marine Noise Registry

NAMESPACE

@@ -9,6 +9,7 @@ export(MNR.DB.Organisations)
 export(MNR.DB.Users)
 export(MNR.GeoPlot)
 export(attachResourcePaths)
+export(mnrNotification)
 export(resourcePrefix)
 export(use_mnr_ui)
 import(dplyr)

R/db_applications.R

@@ -278,6 +278,8 @@ MNR.DB.Applications <- R6::R6Class(
           )
           # Include user what-ifs
           | (user_match & organisation_id == -1 & state_whatif)
+          # Include organisation what-ifs
+          | (!user_match & organisation_match & app_submitter & state_whatif)
           # Admin override
           | (!!flag_admin & organisation_id == -1)
         ) %>%

R/notification.R

@@ -0,0 +1,22 @@
+
+#' Displays a shiny notification with MNR specific settings
+#'
+#' @inheritParams shiny::showNotification
+#' @param message Character string to display in the notification
+#'
+#' @export
+mnrNotification <- function(
+	message, type = "message", session = shiny::getDefaultReactiveDomain()
+) {
+  shiny::showNotification(
+  	message,
+  	type = type,
+  	duration = ifelse(
+  	  type %in% c("warning", "error"),
+  	  getOption("mnr.error_duration", 30),
+  	  getOption("mnr.notify_duration", 15)
+  	),
+  	closeButton = TRUE,
+  	session = session
+  )
+}

inst/www/css/mnr-shiny.css

@@ -81,3 +81,36 @@ hr {
   opacity: 1.0;
   width: 2px;
 }
+
+.shiny-notification-close {
+  font-size: 2em !important;
+}
+
+.dt-scroll-x {
+  overflow-x: auto;
+  clear: both;
+}
+.dt-scroll-x table {
+  width: 150% !important;
+}
+.dt-sticky-left-border {
+  border-right: 3px double #000000;
+}
+.dt-sticky-right-border {
+  border-left: 3px double #000000;
+}
+
+@media(max-width:1200px) {
+  .dtfc-fixed-left {
+    position: inherit !important;
+  }
+  .dtfc-fixed-right {
+    position: inherit !important;
+  }
+  .dt-sticky-left-border {
+    border-right: 0;
+  }
+  .dt-sticky-right-border {
+    border-left: 0;
+  }
+}

man/mnrNotification.Rd

@@ -0,0 +1,19 @@
+% Generated by roxygen2: do not edit by hand
+% Please edit documentation in R/notification.R
+\name{mnrNotification}
+\alias{mnrNotification}
+\title{Displays a shiny notification with MNR specific settings}
+\usage{
+mnrNotification(message, type, session = shiny::getDefaultReactiveDomain())
+}
+\arguments{
+\item{message}{Character string to display in the notification}
+
+\item{type}{A string which controls the color of the notification. One of
+"default" (gray), "message" (blue), "warning" (yellow), or "error" (red).}
+
+\item{session}{Session object to send notification to.}
+}
+\description{
+Displays a shiny notification with MNR specific settings
+}