Merge pull request #81 from HenriKajasilta/dev

Dev R check .yaml update

Author: HenriKajasilta

.github/workflows/R-CMD-check.yaml

@@ -23,6 +23,8 @@ jobs:
       - uses: actions/checkout@v2
       - uses: r-lib/actions/setup-pandoc@v2
       - uses: r-lib/actions/setup-r@v2
+        with:
+          r-version: '4.4.3'
       - name: Install dependencies
         run: |
           install.packages(c("remotes", "rcmdcheck"))
@@ -31,5 +33,9 @@ jobs:
       - name: Check
         run: |
           options(crayon.enabled = TRUE)
-          rcmdcheck::rcmdcheck(args = "--no-manual", error_on = "error")
+          rcmdcheck::rcmdcheck(
+            build_args = "--no-build-vignettes",
+            args = c("--no-manual", "--no-vignettes"),
+            error_on = "error"
+          )
         shell: Rscript {0}

inst/user_doc/user_instructions.md

@@ -11,7 +11,7 @@ pagetitle: fieldactivity
 In order to use the application, you should have a site account registered. If you don’t have an account yet, see the contact section for requesting one, otherwise you should be able to fill in the provided sitename and password to login.
 
 
-![Login page](loginpage.png)
+![Login page](images_user_instructions/loginpage.png)
 
 
 
@@ -22,21 +22,21 @@ The UI of the application is simple, but we will provide an overview of what fun
 1. Change the language between English and Finnish.
 2. Check the sitename you have logged in with. Next to this field, by pressing plus sign (+), it gives an option to logout.
 
-![Overview of layout of the application](Layout.png)
+![Overview of layout of the application](images_user_instructions/Layout.png)
 
 
 3. Change the shown subset of the events based on the type of events, block and year.
 
 As a default, all of the events from all of the (available) blocks and years are visible for the user. With the first option menu, the user is able to select which type of events she wants to keep visible on the summary table. With the second and third option menus, the user can pick the block and the year respectively to be displayed. If there are multiple events displayed, on the bottom of the table there is a navigation tool to switch the shown page.
 
-![Summary table of the events](Eventtable.png)
+![Summary table of the events](images_user_instructions/Eventtable.png)
 
 
 ### Filling in events
 Options for filling in the event will open, when pressing the *Add event* button. Start filling in the management event information by first choosing the block wherein the event has occurred, the name of this activity/event and a date for when it was conducted. One may also provide a short description that will be visible in the event table and later on give a quick reminder to which occurrence the event was related.
 
 
-![Adding a new event](Addevent.png)
+![Adding a new event](images_user_instructions/Addevent.png)
 
 After choosing the type of activity, one should fill in the data about this activity. Different types of activities have different fields to be filled in, for example, after choosing tillage one should fill in the type of tillage, how the tillage was implemented and what the depth of the tillage was. Required option fields are marked with a star sign (*).
 
@@ -51,7 +51,7 @@ Here are some notes that generally apply to all of the activities and that are g
 - **Events can be modified after saving them**, so there is no need to stress about doing something irreversible.
 
 
-![Example of the view for filling in the (tilling) event](eventexample_1.png)
+![Example of the view for filling in the (tilling) event](images_user_instructions/eventexample_1.png)
 
 
 ### Clone event
@@ -82,4 +82,4 @@ You may contact us, if you are facing one or several of the following situations
 - You want to request a feature that is currently not available  
 - You want to know more about the app
 
-Regarding the new features and bug fixes, you can also fill in a github issue [**here**](https://github.com/Ottis1/fieldactivity/issues) without contacting us.
+Regarding the new features and bug fixes, you can also fill in a github issue [**here**](https://github.com/PecanProject/fieldactivity/issues) without contacting us.