From ed3f3d004b25ceb43ec8e880fa112e51220b73ed Mon Sep 17 00:00:00 2001
From: AcuGIS <acugis@noreply.localhost>
Date: Tue, 22 Oct 2024 16:55:14 +0000
Subject: [PATCH] Update docs/source/r.rst

---
 docs/source/r.rst | 34 +++++++++++-----------------------
 1 file changed, 11 insertions(+), 23 deletions(-)

diff --git a/docs/source/r.rst b/docs/source/r.rst
index 23456e9..c1baf73 100644
--- a/docs/source/r.rst
+++ b/docs/source/r.rst
@@ -221,8 +221,6 @@ Give your R code a Name and Description.
 Example
 --------------
 
-The example is animated Plotyl map with Play button.
-
 The main components in this example are the plotly, ggplot2, RPostgreSQL, and htmlwidgets function.
 
 
@@ -240,8 +238,9 @@ The main components in this example are the plotly, ggplot2, RPostgreSQL, and ht
    #saveWidget
    htmlwidgets::saveWidget(as_widget(p), file="index.html")
 
+The example is chart with dynamic PostgreSQL connection is contained in the Sample Apps (Simple Bee Harvest)
 
-An example of a Plotly app is included in the installation.  Here, we add the RPostgreSQL library to connect to PostgreSQL.
+Here, we add the RPostgreSQL library to connect to PostgreSQL.
 
 
 .. code-block:: R
@@ -251,27 +250,16 @@ An example of a Plotly app is included in the installation.  Here, we add the RP
       library(RPostgreSQL)
       library(htmlwidgets)
 
-      conn <- RPostgreSQL::dbConnect("PostgreSQL", host = "localhost", dbname = "$DB_NAME", user = "$DB_USER", password = "$DB_PASS")
+      conn <- RPostgreSQL::dbConnect("PostgreSQL", host = "localhost", dbname = "beedatabase", user = "admin1", password = "ORUVDrYBCQ")
 
-      query_res <- dbGetQuery(conn, 'SELECT * FROM "sensor_readings";');
-      sensor_readings <- as.data.frame(query_res);
-      # sensor_readings$timestamp <- as.Date(sensor_readings$timestamp)
+      query_res <- dbGetQuery(conn, 'select area_id,bee_species,sum(average_harvest) from public.apiary GROUP BY (area_id,bee_species) ORDER BY(area_id)');
+      area_harvest <- as.data.frame(query_res);
+
+      p <- plot_ly(area_harvest, x=~area_id, y=~sum, type="bar",
+ 		text = ~bee_species, textposition = 'auto') %>%
+	   layout(title = "Accumulated Average Harvest per Area for Apis Mellifera Carnica",
+         xaxis = list(title = "Area ID"), yaxis = list(title = "Average Harvest"))
 
-      p <- plot_ly(sensor_readings, x=~timestamp, y=~humidity, text=~paste("Sensor: ", sensor_name), mode="markers", color=~humidity, size=~humidity) %>%
-		      layout(
-				      plot_bgcolor='#e5ecf6',
-				      xaxis = list(  matches='x',
-											 zerolinecolor = '#ffff',
-											 zerolinewidth = 2,
-											 gridcolor = 'ffff',
-											 range = list(	min(sensor_readings$timestamp),
-											 								max(sensor_readings$timestamp))
-																		),
-				      yaxis = list(
-					   zerolinecolor = '#ffff',
-					   zerolinewidth = 2,
-					   gridcolor = 'ffff')
-	   )
 	
       htmlwidgets::saveWidget(as_widget(p), file="index.html")
 
@@ -280,7 +268,7 @@ An example of a Plotly app is included in the installation.  Here, we add the RP
 The output should look at below:
 
 
-   .. image:: images/R-Sensor.png
+   .. image:: images/rplotly-postgresql.png
 
 
 R Standard Plot (PNG)