From 06431e985962330f2f5b477ade532b9545c82b97 Mon Sep 17 00:00:00 2001 From: Bruno Ribas Date: Wed, 29 Mar 2023 10:30:10 -0300 Subject: private/score.sep: more sane default --- src/private/score.sep | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/src/private/score.sep b/src/private/score.sep index 7863dde..5287288 100644 --- a/src/private/score.sep +++ b/src/private/score.sep @@ -1,20 +1 @@ -Global 101 102 103 104 105 106 107 108 109 110 121 122 123 124 -Caribbean 110 121 123 -MexicoCA 104 109 122 124 -NorthRegion 102 103 -SouthRegion 105 106 107 108 -Argentina 105 -Bolivia 106 -Brasil 101 -Chile 107 -Colombia 102 -CostaRica 122 -Cuba 110 -ElSalvador 124 -Mexico 109 -Panama 104 -Peru 108 -PuertoRico 123 -RepDominicana 121 -Venezuela 103 -TEST 99 +Global 1 -- cgit v1.2.3 From e3bdd4846dd4d21e1fcbf28804d4728e82bda38f Mon Sep 17 00:00:00 2001 From: Bruno Ribas Date: Wed, 29 Mar 2023 10:30:59 -0300 Subject: barplot.py: moved to the correct location --- src/admin/barplot.py | 32 -------------------------------- src/admin/report/barplot.py | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 32 deletions(-) delete mode 100644 src/admin/barplot.py create mode 100644 src/admin/report/barplot.py diff --git a/src/admin/barplot.py b/src/admin/barplot.py deleted file mode 100644 index d07f156..0000000 --- a/src/admin/barplot.py +++ /dev/null @@ -1,32 +0,0 @@ -import matplotlib.pyplot as plt -import sys - -filename = sys.argv[1] -title = sys.argv[2] - - -x = [str(x) + '-' + str(x+10) for x in range(0,300,10)] - -with open(filename,'r') as file: - y = [int(line) for line in file] - -# Create a bar plot -plt.bar(x, y,width=0.5) - - -# Set the y-axis tick labels to step by 5 -plt.xticks(rotation=90) -if(max(y)<200): - plt.yticks(range(0, max(y)+1, 5)) -else: - plt.yticks(range(0, max(y)+1, 10)) -# Add gridlines to the y-axis -plt.grid(axis='y') - -# Add a title to the plot -plt.title(title) - -plt.tight_layout() - -# Show the plot -plt.savefig(filename.replace('.txt','.png'),dpi=600,transparent=True) diff --git a/src/admin/report/barplot.py b/src/admin/report/barplot.py new file mode 100644 index 0000000..d07f156 --- /dev/null +++ b/src/admin/report/barplot.py @@ -0,0 +1,32 @@ +import matplotlib.pyplot as plt +import sys + +filename = sys.argv[1] +title = sys.argv[2] + + +x = [str(x) + '-' + str(x+10) for x in range(0,300,10)] + +with open(filename,'r') as file: + y = [int(line) for line in file] + +# Create a bar plot +plt.bar(x, y,width=0.5) + + +# Set the y-axis tick labels to step by 5 +plt.xticks(rotation=90) +if(max(y)<200): + plt.yticks(range(0, max(y)+1, 5)) +else: + plt.yticks(range(0, max(y)+1, 10)) +# Add gridlines to the y-axis +plt.grid(axis='y') + +# Add a title to the plot +plt.title(title) + +plt.tight_layout() + +# Show the plot +plt.savefig(filename.replace('.txt','.png'),dpi=600,transparent=True) -- cgit v1.2.3 From a2f7bf224c020bc33ade7f0949cc595f935391f8 Mon Sep 17 00:00:00 2001 From: Bruno Ribas Date: Wed, 29 Mar 2023 10:32:28 -0300 Subject: d/control: add python3-matplotlib as depends for boca-web --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 7ea2089..fd6fea9 100644 --- a/debian/control +++ b/debian/control @@ -31,7 +31,7 @@ Description: BOCA - database Package: boca-web Architecture: all -Depends: ${misc:Depends}, ${shlibs:Depends}, boca-common, apache2, php8.1-fpm, php8.1 +Depends: ${misc:Depends}, ${shlibs:Depends}, boca-common, apache2, php8.1-fpm, php8.1, python3-matplotlib Conflicts: libapache2-mod-php Description: BOCA - WEB files BOCA is a software created to control a contest with the ACM International -- cgit v1.2.3 From bc8f416bcafae56ebcb3b10c42586b4e413c5e5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Davi=20Ant=C3=B4nio?= <30875784+DaviAntonio@users.noreply.github.com> Date: Wed, 29 Mar 2023 13:40:19 +0000 Subject: Release 1.5.17-1 (#27) * Update version info and year The following files were updated to the next version to be released and the current year: - src/version - src/versionnum.php * Release 1.5.17-1 Update changelog with all the changes made since its last update on commit 818abd88. --- debian/changelog | 27 +++++++++++++++++++++++++++ src/version | 2 +- src/versionnum.php | 4 ++-- 3 files changed, 30 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index a837589..6dfb332 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,30 @@ +boca (1.5.17-1) jammy; urgency=medium + + [ Bruno Ribas ] + * webcast.php: Add lock to avoid sending corrupted files + * src/db.php: Begin migration to php8.1 requirement. Fix use of pg_lo_export + * src/scoretable.php: Remove all each() usage + + [ Daniel Saad Nogueira Nunes ] + * Update stat.php + * Update stat.php (#23) + * Create barplot.py (#24) + * Create piechart.py (#25) + + [ Bruno Ribas ] + * scoretable.php: fix scoreboard to show correct teams + + [ Daniel Saad Nogueira Nunes ] + * Update frun.php (#26) + + [ Rodrigo Laiola Guimarães ] + * Fix user multi-login problem when running BOCA with a reverse proxy (#19) + + [ Davi Antônio da Silva Santos ] + * Update version info and year + + -- Davi Antônio da Silva Santos Mon, 27 Mar 2023 22:55:23 -0300 + boca (1.5.16-2) jammy; urgency=medium * Enable boca's virtual host on HTTP (web interface) diff --git a/src/version b/src/version index 99637e4..0c87bbd 100644 --- a/src/version +++ b/src/version @@ -1 +1 @@ -boca-1.5.14 +boca-1.5.17 diff --git a/src/versionnum.php b/src/versionnum.php index fc9810f..15f50f9 100644 --- a/src/versionnum.php +++ b/src/versionnum.php @@ -1,5 +1,5 @@ -- cgit v1.2.3