Skip to content

Commit

Permalink
0.3.8-beta
Browse files Browse the repository at this point in the history
  • Loading branch information
nigel-bmlt committed Apr 12, 2022
1 parent 02c3c27 commit d028213
Show file tree
Hide file tree
Showing 27 changed files with 634 additions and 234 deletions.
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,6 @@
.phpunit.cache
.phpunit.result.cache
/vendor
.vscode
.vscode
package-lock.json
/node_modules
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
## 0.3.8-beta
- **Breaking database changes in this release - please deactivate and reactivate the plugin before using**
- Time display in submission amended when no changes have been made #34
- Day/Time shown in meeting submission change summary #31
- Time display in submission is now in local browser time #37
- Testcafe user form success tests created (and lots of bugs found already!)

## 0.3.7-beta (April 9, 2022)
- Virtual meetings and associated fields now fully supported! https://github.com/bmlt-enabled/wordpress-bmlt-workflow/issues/25 (thanks @brustar !)
- BMLT configuration UI rewritten
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ For trusted servants, there is now one place that you can see submitted requests

For admins, modification of email templates, service committees and email contact details can now be done in the same place, without complex logic in a form builder.

This initial release is quite specific to the NA Australian Region use case (particularly the FSO/Starter Kit email) but the code is written such that templates are relatively easy to adjust based on feedback from other regions.
This initial release is specific to the NA Australian Region use case (particularly the FSO/Starter Kit email) but the code is written such that templates are relatively easy to adjust based on feedback from other regions.

## Features
- Form Submitters - Minimal typing of details with most content populated from BMLT
Expand Down
2 changes: 0 additions & 2 deletions config.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
<?php
define('WBW_DEBUG', false);
define('WBW_PLUGIN_DIR', plugin_dir_path(__FILE__));
// placeholder for an 'other' service body
define('CONST_OTHER_SERVICE_BODY', '99999999999');
2 changes: 0 additions & 2 deletions config_phpunit.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
<?php
define('WBW_DEBUG', false);
// placeholder for an 'other' service body
define('CONST_OTHER_SERVICE_BODY', '99999999999');

// get us through the header
if (!defined('ABSPATH')) {
Expand Down
8 changes: 4 additions & 4 deletions css/admin_submissions.css
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
.form-grid {
display: grid;
grid-gap: 10px;
grid-template-columns: auto-fill, [col] auto;
grid-template-rows: repeat(auto-fill, [row] auto );
grid-template-columns: repeat(2, [col] 1fr);
grid-template-rows: repeat(2, [row] auto);
}

.form-grid-top {
Expand All @@ -25,8 +25,8 @@
}

.form-grid-col1 {
grid-column: col ;
grid-row: col 2;
grid-column: col;
grid-row: row 2;
}

.form-grid-col2{
Expand Down
56 changes: 53 additions & 3 deletions css/meeting_update_form.css
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ body {
.form-grid {
display: grid;
grid-gap: 10px;
grid-template-columns: auto-fill, [col] auto;
grid-template-rows: repeat(auto-fill, [row] auto );
grid-template-columns: repeat(2, [col] 1fr);
grid-template-rows: repeat(5, [row] auto);
}

.form-grid-top {
Expand All @@ -39,13 +39,14 @@ body {

.form-grid-col1 {
grid-column: col ;
grid-row: col 2 / span 3 ;
grid-row: row 2 / span 3 ;
}

.form-grid-col2-1 {
grid-column: col 2 ;
grid-row: row 2 ;
}

.form-grid-col2-2 {
grid-column: col 2 ;
grid-row: row 3 ;
Expand Down Expand Up @@ -189,4 +190,53 @@ span.dashicons.dashicons-info-outline {
transform:translate(-50%,-50%) rotate(-45deg);
background-color:#FFFFE0;
border:1px solid #DCA;
}


.tooltip .right {
min-width:10em;
max-width:500em;
white-space: nowrap;
top:50%;
left:100%;
margin-left:20px;
line-height: 1.4em;
transform:translate(0, -50%);
padding:10px;
color:#666666;
background-color:#FFFFE0;
font-weight:normal;
font-size:13px;
border-radius:8px;
position:absolute;
z-index:99999999;
box-sizing:border-box;
display:none;
border:1px solid #DCA;
}

.tooltip:hover .right {
display:block;
}

.tooltip .right i {
position:absolute;
top:50%;
right:100%;
margin-top:-12px;
width:12px;
height:24px;
overflow:hidden;
}

.tooltip .right i::before {
content:'';
position:absolute;
width:12px;
height:12px;
left:0;
top:50%;
transform:translate(50%,-50%) rotate(45deg);
background-color:#FFFFE0;
border:1px solid #DCA;
}
24 changes: 13 additions & 11 deletions js/admin_options.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,15 +59,12 @@ jQuery(document).ready(function ($) {
},
buttons: {
"Test Configuration": function () {
test_configuration();
test_configuration(false);
},
"Save and Close": function () {
save_results(this);
// trigger an update on the main page
test_configuration().then((data) =>
{
update_from_test_result(data);
});
test_configuration(true);
$(this).dialog("close");
},
Cancel: function () {
Expand Down Expand Up @@ -98,8 +95,7 @@ jQuery(document).ready(function ($) {
$("#wbw_bmlt_configuration_dialog").dialog("open");
});

function test_configuration() {
return new Promise((resolve) => {
function test_configuration(saving) {

var parameters = {};
parameters["wbw_bmlt_server_address"] = $("#wbw_bmlt_server_address").val();
Expand All @@ -119,14 +115,20 @@ jQuery(document).ready(function ($) {
})
.done(function (response) {
notice_success(response, "quickedit-wp-header-end");
resolve(response);
if(saving)
{
update_from_test_result(response);
}
})
.fail(function (xhr) {
notice_error(xhr, "quickedit-wp-header-end");
resolve(xhr);
if(saving)
{
update_from_test_result(xhr);
}
})
})
}
}


function get_test_status() {
return new Promise((resolve) => {
Expand Down
Loading

0 comments on commit d028213

Please sign in to comment.