Skip to content

Commit

Permalink
Prepare release 4.0
Browse files Browse the repository at this point in the history
Switch from highchart.js -> chart.js
and code cleanup
  • Loading branch information
seehase committed Mar 24, 2024
1 parent cdb2e20 commit 8586a8e
Show file tree
Hide file tree
Showing 62 changed files with 3,408 additions and 3,589 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/pr-version-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ jobs:
# read version from file: ZonPHP/inc/version_info.php of master branch
MASTER_VERSION=$( grep '$version = ' ZonPHP/inc/version_info.php | cut -d '"' -f 2 )
echo "MASTER_VERSION --> $MASTER_VERSION"
if [ "$HEAD_VERSION" \> "$MASTER_VERSION" ]; then
#if [ "$HEAD_VERSION" \> "$MASTER_VERSION" ]; then
if [ "$(printf '%s\n' "$HEAD_VERSION" "$MASTER_VERSION" | sort -V | head -n 1)" != "$HEAD_VERSION" ]; then
echo "Great job, master version $MASTER_VERSION will become $HEAD_VERSION soon"
else
echo "Head $HEAD_VERSION not updated before merging into master"
Expand Down
2 changes: 1 addition & 1 deletion EMU/Exporter.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,4 @@
file_get_contents(trim($pvOutputURL));
mysqli_query($mysqli,$sql)or die ('SQL Error fout:'. mysqli_error($mysqli));
}
?>

1 change: 0 additions & 1 deletion EMU/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,3 @@

header('Location: ../index.php');

?>
9 changes: 4 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,24 +1,23 @@
# ZonPHP
## PHP Solar Logger

Based on the version from Slaper and Rally
I decided to build an new version without Adobe FLASH so it can be used
Based on the initial version from Slaper and Rally
I have continued and enhanced the project. The current version supports PHP8 and can be used
on mobiles and tablets as well.

![index.png](resources%2Findex.png)

I replaced all charts with new JavaScript charts using http://www.highcharts.com/
and refactored the PHP code to support PHP8.
Major changes in release 4 is the replacement of highchart with chart.js ( https://www.chartjs.org/)

If you have any feedback or questions, please contact me at https://github.com/seehase/ZonPHP/issues

### Day-View
![img|320x271](resources%2Fday_view.png)
![img.png](img.png)


### All years per month view
![all_years.png](resources%2Fall_years.png)

## download
* last stable version [download](https://github.com/seehase/ZonPHP/archive/master.zip)
* current development version: [download](https://github.com/seehase/ZonPHP/archive/development.zip)
Loading

0 comments on commit 8586a8e

Please sign in to comment.