Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP: Support for subplugins #4

Open
wants to merge 124 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
124 commits
Select commit Hold shift + click to select a range
a85e546
fix wrong command to install plugin
TamaroWalter Dec 5, 2023
fbf4cea
experiment use of dropdowns for preferences
TamaroWalter Dec 5, 2023
30ca30e
initialization for subplugin support
TamaroWalter Dec 20, 2023
b2a020f
declaration of important functions
TamaroWalter Dec 21, 2023
c74dadb
pull from main
TamaroWalter Jan 10, 2024
e59fe3a
change color variables, add optional admin setting page
TamaroWalter Jan 10, 2024
19f5c55
codecheck fix
TamaroWalter Jan 10, 2024
ed6b01a
new locallib for global functions
TamaroWalter Jan 11, 2024
536d50f
support for subplugins implemented
TamaroWalter Jan 11, 2024
bfad7f2
subplugin for moodleoverflow initialized
TamaroWalter Jan 15, 2024
a5b6c30
codecheck fixes
TamaroWalter Jan 15, 2024
090e3d9
rename files and remove block type from subplugin
TamaroWalter Jan 17, 2024
163c3e2
name changes for subplugin
TamaroWalter Jan 17, 2024
2a9e6ff
add colorpicking setting for townsquare colors
TamaroWalter Jan 22, 2024
a4ae4c9
color setting for letters added
TamaroWalter Jan 24, 2024
6b0351c
add coursefilter checkboxes and basic javascript
TamaroWalter Jan 31, 2024
6e4a3bc
course filter functionality implemented
TamaroWalter Feb 1, 2024
b912240
all filters defined
TamaroWalter Feb 7, 2024
2ed9d81
filters in js completed
TamaroWalter Feb 7, 2024
9ad9fe1
files adapted for js filters
TamaroWalter Feb 7, 2024
41111f8
code styling
TamaroWalter Feb 7, 2024
0b878f7
language strings for filters
TamaroWalter Feb 7, 2024
9f5ed72
typo fix
TamaroWalter Feb 7, 2024
dc471d5
new database to store filter settings for a user
TamaroWalter Feb 7, 2024
6e1c5c9
improved time filter
TamaroWalter Feb 8, 2024
a4ffb51
WIP: functionality to save usersettings
TamaroWalter Feb 8, 2024
37a4579
support for database call from javascript
TamaroWalter Feb 9, 2024
684e9af
WIP: use javascript to controll settings saving
TamaroWalter Feb 9, 2024
94db6cb
WIP: load usersettingsfrom database into townsquare
TamaroWalter Feb 9, 2024
40967f3
filter controller to enable multiple filters at once
TamaroWalter Feb 12, 2024
6db1557
time filter error fixed and coding style
TamaroWalter Feb 12, 2024
5fc4841
WIP try to acces own web service
TamaroWalter Mar 13, 2024
710a24f
Save settings in Database works correctly
TamaroWalter Mar 15, 2024
7d4cb65
WIP: execute time filter. Letter filter functions correctly
TamaroWalter Mar 15, 2024
cd7915b
executing usersettings functions
TamaroWalter Mar 18, 2024
5fe450c
WIP: add a success label
TamaroWalter Mar 18, 2024
4bef8d6
codecleaning
TamaroWalter Mar 18, 2024
2f1666a
add a success label
TamaroWalter Mar 18, 2024
844b12e
update workflows to moodle 403
TamaroWalter Mar 18, 2024
37f741d
change database name
TamaroWalter Mar 20, 2024
72ca2ab
make tablename shorter
TamaroWalter Mar 20, 2024
ae06851
update table in database
TamaroWalter Mar 21, 2024
91833cc
add privacy provider functions
TamaroWalter Mar 21, 2024
7c5dd1d
fix error in contentcontroller
TamaroWalter Mar 21, 2024
bf838a6
WIP: write test for privacy provider
TamaroWalter Mar 21, 2024
edbb2ed
add privacy provider test
TamaroWalter Mar 22, 2024
96ae099
moodlecheck fixes and code cleaning
TamaroWalter Mar 22, 2024
572fce9
change user table name for pgsql
TamaroWalter Mar 22, 2024
57de455
change line breaks to LF in JS-file
TamaroWalter Mar 22, 2024
f8b9420
record_usersettings function shorter
TamaroWalter Mar 25, 2024
8db0fb9
add test for externallib
TamaroWalter Mar 25, 2024
1bc6555
try to fix github workflow issues
TamaroWalter Mar 25, 2024
b1036ff
WIP: fix failing tests
TamaroWalter Mar 25, 2024
7b463e9
WIP: trying to fix phpunit test
TamaroWalter Mar 25, 2024
c5fcd75
phpunit test work in M4.1 now
TamaroWalter Mar 25, 2024
3662158
use language strings in townsquare letters
TamaroWalter Mar 27, 2024
89089f1
WIP: Add behat tests to townsquare
TamaroWalter Apr 3, 2024
2e25efd
basic coursefilter behat test added
TamaroWalter Apr 3, 2024
97bba0b
WIP: time filter behat test
TamaroWalter Apr 4, 2024
36e4c1b
complete behat tests added
TamaroWalter Apr 5, 2024
6b41808
adapt behat for older moodle versions
TamaroWalter Apr 8, 2024
16b9e62
use non deprecated language strings
TamaroWalter Apr 8, 2024
0a4fb3d
update workflow php version
TamaroWalter Apr 8, 2024
0811b57
implement feature from other branch
TamaroWalter Apr 8, 2024
d6fddff
fix codechecker fails
TamaroWalter Apr 8, 2024
2de340b
add test for usersetting save function
TamaroWalter Apr 8, 2024
969295d
WIP: Try to fix Web-service
TamaroWalter Apr 9, 2024
741171c
Merge branch 'feature/userpreferences' of github.com:learnweb/moodle-…
TamaroWalter Apr 9, 2024
d9cfd65
adapt function names to moodleoverflow
TamaroWalter Apr 11, 2024
5af694d
WIP: try to implement new subplugin structure
TamaroWalter Apr 23, 2024
7d533f1
townsquare subplugin adaptation successful
TamaroWalter May 7, 2024
f2e1f6f
add townsquaresupport plugin installation for workflows
TamaroWalter May 8, 2024
5730a5e
codecleaning
TamaroWalter May 8, 2024
37873d6
add todo for subplugins
TamaroWalter May 8, 2024
14b2074
update workflow matrix
TamaroWalter May 8, 2024
3cae9ce
delete moodleoverflow native support, adapt locallib
TamaroWalter May 8, 2024
c47b5f7
support for ratingallocate made with subplugin
TamaroWalter May 9, 2024
67f731b
update readme
TamaroWalter May 9, 2024
a5cb904
Update README.md
TamaroWalter May 14, 2024
9bdfa2a
move anonymous attribute to subplugin
TamaroWalter May 16, 2024
fc26aff
Merge branch 'feature/subplugins' of github.com:learnweb/moodle-block…
TamaroWalter May 16, 2024
667d400
move function to subplugins
TamaroWalter May 16, 2024
581b5db
WIP: try to fix webservice
TamaroWalter May 16, 2024
8fdd5c0
web service fixed
TamaroWalter May 17, 2024
f657fe5
adapt external class for moodle 401
TamaroWalter May 17, 2024
c35f6f4
require externallib for moodle 401
TamaroWalter May 17, 2024
52f74f4
delete unused function
TamaroWalter May 17, 2024
03d3e81
add branch condition and require externallib
TamaroWalter May 17, 2024
7bbecd7
try to fix behat failing in M4.1
TamaroWalter May 17, 2024
7d0f2a3
add annotation to phpunit
TamaroWalter May 17, 2024
447ff94
delete require once in services
TamaroWalter May 17, 2024
58c5cc4
get subplugins events only when available
TamaroWalter May 23, 2024
8528555
change button activition effect
TamaroWalter May 24, 2024
8d47e63
adapt workflow matrix to M4.4
TamaroWalter May 24, 2024
2ad11ef
use m4.4 as standard in github ci
TamaroWalter May 24, 2024
e3f9187
WIP: fix for M4.1
TamaroWalter May 24, 2024
98bed7b
WIP: fix for M4.1
TamaroWalter May 24, 2024
a983c30
WIP: fix for M4.1
TamaroWalter May 24, 2024
926e615
WIP: fix for M4.1
TamaroWalter May 24, 2024
15f0fab
WIP: fix for M4.1
TamaroWalter May 24, 2024
5e30a0d
WIP: fix for M4.1
TamaroWalter May 24, 2024
e665ab9
WIP: fix for M4.1
TamaroWalter May 24, 2024
c43953f
WIP fix for M4.1
TamaroWalter May 24, 2024
178b7eb
WIP: fix for M4.1
TamaroWalter May 24, 2024
dc49377
WIP: fix for M4.1
TamaroWalter May 24, 2024
0ec224c
code cleaning
TamaroWalter May 24, 2024
633d563
behat works on M4.1
TamaroWalter May 24, 2024
5d3426b
Merge branch 'feature/userpreferences' of github.com:learnweb/moodle-…
TamaroWalter May 24, 2024
2b3a734
post pictures are shown correctly
TamaroWalter Jun 7, 2024
1909122
new testsuite and language fix
TamaroWalter Jun 7, 2024
c36f6a8
add internal check
TamaroWalter Jun 7, 2024
1d4825f
codecleaning
TamaroWalter Jun 11, 2024
9306e04
adapt code to new codechecker version
TamaroWalter Jun 13, 2024
ebfc411
rename locallib to lib
TamaroWalter Jun 20, 2024
d41ac75
WIP: code mess cleaning
TamaroWalter Jun 23, 2024
2f3ac6a
php mess cleaning
TamaroWalter Jun 23, 2024
23c4bb4
php mess cleaning completed
TamaroWalter Jun 27, 2024
bf4f8e4
behat problems solved
TamaroWalter Jul 4, 2024
ebfeec2
add subplugins to workflow
TamaroWalter Jul 4, 2024
2166e9b
code cleaning
TamaroWalter Jul 4, 2024
718499e
merge with userpreferences branch
TamaroWalter Jul 4, 2024
f531d02
resolve merge conflict in ci file
TamaroWalter Jul 11, 2024
a85ccdb
codecleaning
TamaroWalter Jul 11, 2024
ba9f631
added functionality for private forum reply
TamaroWalter Jul 11, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 35 additions & 5 deletions .github/workflows/moodle-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ jobs:

strategy:
matrix:
php: ['8.1']
moodle-branch: ['MOODLE_403_STABLE']
php: ['8.3']
moodle-branch: ['MOODLE_404_STABLE']
database: ['pgsql']

steps:
Expand Down Expand Up @@ -59,6 +59,18 @@ jobs:
- name: Install mod plugin
run: moodle-plugin-ci add-plugin learnweb/moodle-mod_moodleoverflow

- name: Install local plugin
run: moodle-plugin-ci add-plugin learnweb/moodle-local_townsquaresupport

- name: Install townsquareexpansion plugin
run: moodle-plugin-ci add-plugin learnweb/moodle-townsquareexpansion_moodleoverflow

- name: Install townsquareexpansion plugin
run: moodle-plugin-ci add-plugin learnweb/moodle-townsquareexpansion_ratingallocate

- name: Install townsquareexpansion plugin
run: moodle-plugin-ci add-plugin learnweb/moodle-townsquareexpansion_zoom

- name: Install moodle-plugin-ci
run: |
moodle-plugin-ci install --plugin ./plugin --db-host=127.0.0.1 --no-init
Expand Down Expand Up @@ -113,9 +125,27 @@ jobs:
strategy:
fail-fast: false
matrix:
php: ['8.0', '8.1']
moodle-branch: ['MOODLE_401_STABLE', 'MOODLE_402_STABLE', 'MOODLE_403_STABLE']
database: ['mariadb', 'pgsql']
php: [ '8.0', '8.1', '8.2', '8.3' ]
moodle-branch: [ 'MOODLE_401_STABLE', 'MOODLE_402_STABLE', 'MOODLE_403_STABLE', 'MOODLE_404_STABLE' ]
database: [ 'mariadb', 'pgsql' ]
exclude:
- php: '8.0'
moodle-branch: 'MOODLE_404_STABLE'
- php: '8.2'
moodle-branch: 'MOODLE_401_STABLE'
- php: '8.3'
moodle-branch: 'MOODLE_401_STABLE'
- php: '8.3'
moodle-branch: 'MOODLE_402_STABLE'
- php: '8.3'
moodle-branch: 'MOODLE_403_STABLE'
include:
- php: '7.4'
moodle-branch: 'MOODLE_401_STABLE'
database: 'pgsql'
- php: '7.4'
moodle-branch: 'MOODLE_401_STABLE'
database: 'mariadb'

steps:
- name: Start MariaDB
Expand Down
18 changes: 17 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,22 @@
# Town Square #

A moodle block for the dashboard.This Plugin shows current events and forum posts in courses the user is enrolled to.
A moodle block for the dashboard. This Plugin shows current events and forum posts in courses the user is enrolled.

## Description ##

The Goal of this plugin is to implement a block, where the different notifications (e.g. deadlines), activity completion and forum posts
from different courses are shown. Additionally, the user is able to filter the notifications by different parameters.

## Subplugin functionality ##

Townsquare does not show notifications from every installed plugin, as every plugin can have different types of notifications that
not always should be shown to the current user (e.g. a teacher should not see the same notifications as a student).
Therefore, only the Moodle core plugins are supported by the plugin.
To show notifications from other plugins, a subplugin can be implemented or installed. To do that, install the local plugin
local_townsquaresupport (see: https://github.com/learnweb/moodle-local_townsquaresupport). Townsquaresupport manages
subplugins and makes them available to Townsquare.

More information on townsquare subplugins: https://github.com/learnweb/moodle-local_townsquaresupport/wiki

## Installing via uploaded ZIP file ##

Expand Down
14 changes: 14 additions & 0 deletions amd/build/coursefilter.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions amd/build/coursefilter.min.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 14 additions & 0 deletions amd/build/filtercontroller.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions amd/build/filtercontroller.min.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 14 additions & 0 deletions amd/build/letterfilter.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions amd/build/letterfilter.min.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading