Merge pull request #20 from NorwegianVeterinaryInstitute/dev

OKplan v0.7.1

Author: PetterHopp

.Rbuildignore

@@ -12,3 +12,4 @@
 ^Meta$
 ^OKplan.Rcheck\vign_test$
 ^CONTRIBUTING\.md
+^LICENSE\.md

CONTRIBUTING.md

@@ -39,48 +39,54 @@ some NVIverse functions</td>
 databases</td>
 </tr>
 <tr class="odd">
+<td style="text-align: left;">NVIpjsr</td>
+<td style="text-align: left;">Public</td>
+<td style="text-align: left;">Tools to facilitate working with PJS
+data</td>
+</tr>
+<tr class="even">
 <td style="text-align: left;">NVIspatial</td>
 <td style="text-align: left;">Public</td>
 <td style="text-align: left;">Tools to facilitate working with spatial
 data at NVI</td>
 </tr>
-<tr class="even">
+<tr class="odd">
 <td style="text-align: left;">NVIpretty</td>
 <td style="text-align: left;">Public</td>
 <td style="text-align: left;">Tools to make R-output pretty in accord
 with NVI’s graphical profile</td>
 </tr>
-<tr class="odd">
+<tr class="even">
 <td style="text-align: left;">NVIbatch</td>
 <td style="text-align: left;">Public</td>
 <td style="text-align: left;">Tools to facilitate the running of
 R-scripts in batch mode at NVI</td>
 </tr>
-<tr class="even">
+<tr class="odd">
 <td style="text-align: left;">OKplan</td>
 <td style="text-align: left;">Public</td>
 <td style="text-align: left;">Tools to facilitate the planning of
 surveillance programmes for the NFSA</td>
 </tr>
-<tr class="odd">
+<tr class="even">
 <td style="text-align: left;">OKcheck</td>
 <td style="text-align: left;">Public</td>
 <td style="text-align: left;">Tools to facilitate checking of data from
 national surveillance programmes</td>
 </tr>
-<tr class="even">
+<tr class="odd">
 <td style="text-align: left;">NVIcheckmate</td>
 <td style="text-align: left;">Public</td>
 <td style="text-align: left;">Extension of checkmate with argument
 checking adapted for NVIverse</td>
 </tr>
-<tr class="odd">
+<tr class="even">
 <td style="text-align: left;">NVIpackager</td>
 <td style="text-align: left;">Public</td>
 <td style="text-align: left;">Tools to facilitate the development of
 NVIverse packages</td>
 </tr>
-<tr class="even">
+<tr class="odd">
 <td style="text-align: left;">NVIrpackages</td>
 <td style="text-align: left;">Public</td>
 <td style="text-align: left;">Keeps a table of the R packages in

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: OKplan
 Title: Tools to facilitate the Planning of the annual Surveillance Programmes
-Version: 0.7.0
-Date: 2024-01-05
+Version: 0.7.1
+Date: 2024-11-12
 Authors@R: 
   c(person(given = "Petter",
            family = "Hopp",
@@ -14,20 +14,20 @@ Description: Provide tools to facilitate the planning of the annual surveillance
     NFSA.
 URL: https://github.com/NorwegianVeterinaryInstitute/OKplan
 BugReports: https://github.com/NorwegianVeterinaryInstitute/OKplan/issues
-Depends: R (>= 3.5.0)
+Depends: R (>= 4.1.0)
 License: BSD_3_clause + file LICENSE
 Encoding: UTF-8
 LazyData: true
 Imports:
     checkmate,
     dplyr,
-    magrittr,
     openxlsx,
     rlang,
     stats,
     NVIbatch (>= 0.4.0),
     NVIcheckmate (>= 0.7.3),
-    NVIdb (>= 0.3.0),
+    NVIdb,
+    NVIpjsr,
     NVIpretty (>= 0.4.0),
     OKcheck
 Suggests:
@@ -47,10 +47,11 @@ Remotes:
     NorwegianVeterinaryInstitute/NVIbatch,
     NorwegianVeterinaryInstitute/NVIcheckmate,
     NorwegianVeterinaryInstitute/NVIdb,
-    NorwegianVeterinaryInstitute/NVIpretty,
     NorwegianVeterinaryInstitute/NVIpackager,
+    NorwegianVeterinaryInstitute/NVIpjsr,
+    NorwegianVeterinaryInstitute/NVIpretty,
     NorwegianVeterinaryInstitute/NVIrpackages,
     NorwegianVeterinaryInstitute/OKcheck
-RoxygenNote: 7.2.3
+RoxygenNote: 7.3.1
 VignetteBuilder: knitr
 Language: en-GB

LICENSE

@@ -1,29 +1,3 @@
-BSD 3-Clause License
-
-Copyright (c) 2020 - 2024 Norwegian Veterinary Institute
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its
-   contributors may be used to endorse or promote products derived from
-   this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+YEAR: 2020 - 2024
+COPYRIGHT HOLDER: Norwegian Veterinary Institute
+ORGANIZATION: Norwegian Veterinary Institute

LICENSE.md

@@ -0,0 +1,29 @@
+BSD 3-Clause License
+
+Copyright (c) 2020 - 2024 Norwegian Veterinary Institute
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its
+   contributors may be used to endorse or promote products derived from
+   this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

NAMESPACE

@@ -10,5 +10,4 @@ export(get_tested_herds)
 export(make_random)
 export(style_sum_line)
 export(write_ok_selection_list)
-importFrom(magrittr,"%>%")
 importFrom(rlang,.data)