Merge pull request #73 from ppfeufer/development

Next Release - v1.15.2

CHANGELOG.md

@@ -9,6 +9,20 @@ and this project adheres to [Semantic Versioning](http://semver.org/)
 ## [In Development] - Unreleased
 
 
+## [1.15.2] - 2022-07-21
+
+### Added
+
+- Tooltip to make it a bit more obvious that SRP payout values can be changed (#72)
+
+  ![Tooltip: Change SRP Payout Amount](aasrp//images/tooltip-change-srp-payout-amount.png "Tooltip: Change SRP Payout Amount")
+
+### Changed
+
+- Moved SRP recalculation to its own function
+- Highlight color for SRP amount changed
+
+
 ## [1.15.1] - 2022-07-11
 
 ### Fixed

CONTRIBUTING.md

@@ -14,13 +14,13 @@ verify compliance with formatting rules. To use:
 
 You can check if your code to commit adheres to the given style by simply running:
 
-```shell script
+```shell
 pre-commit
 ```
 
 or to check all files:
 
-```shell script
+```shell
 pre-commit run --all-files
 ```
 
@@ -43,6 +43,24 @@ Please make sure you have signed the [License Agreement](https://developers.eveo
 by logging in at https://developers.eveonline.com before submitting any pull requests.
 
 
+### Commits
+
+Commit headers should be short (not longer than 70 characters) and precise. Use
+the commit body for a more detailed explanation of the commit.
+
+Commit headers should be prefixed to state what kind of commit it is.
+
+- `[FEATURE] Foobar` When a new feature is introduced
+- `[ADDED] Foobar` When something is added to the code base to enhance existing
+  functions
+- `[REMOVED] Foobar` When something is removed, like deprecated or unused code
+- `[FIX] Foobar` For bug fixes or fixes in general. Ideally followed by an issue ID
+- `[CHANGE] Foobar` When Code or appearance has been changed that doesn't fit in any
+  of the other categories. Usually for changes in templates or optimisations in the
+  Python code itself
+- `[MISC] Foobar` When it doesn't fit in anything else
+
+
 ### Test Coverage
 
 Please make sure your contribution comes with tests covering your additions and

aasrp/__init__.py

@@ -2,5 +2,5 @@
 A couple of variable to use throughout the app
 """
 
-__version__ = "1.15.1"
+__version__ = "1.15.2"
 __title__ = "Ship Replacement"

aasrp/static/aasrp/css/aa-srp.css

@@ -14,9 +14,9 @@
     }
 
     .btn-icon-aasrp {
+        height: 36px;
         margin: 0.1rem;
         width: 36px;
-        height: 36px;
     }
 
     .btn-icon-aasrp-status {
@@ -92,6 +92,18 @@
     .aa-srp-fa-icon-right {
         margin-left: 1rem;
     }
+
+    .srp-request-payout-amount-editable .srp-payout-amount {
+        border-bottom: dashed 1px rgb(0 136 204);
+        cursor: pointer;
+        display: block;
+    }
+
+    .srp-request-payout-amount-editable .srp-payout-amount-changed {
+        border-bottom: dashed 1px rgb(204, 71, 0);
+        cursor: pointer;
+        display: block;
+    }
 }
 
 @media all and (min-width: 992px) {
@@ -108,8 +120,8 @@
     }
 
     .dataTables_wrapper > .form-inline select {
-        margin-right: 1rem;
         margin-bottom: 1rem;
+        margin-right: 1rem;
     }
 
     .dataTables_wrapper > .form-inline select:last-child {

aasrp/static/aasrp/javascript/aa-srp-dashboard.js

@@ -104,10 +104,12 @@ $(document).ready(() => {
          */
         createdRow: (row, data, rowIndex) => {
             // Row id attr
-            $(row).attr('data-row-id', rowIndex);
-            $(row).attr('data-srp-request-code', data.srp_code);
+            $(row)
+                .attr('data-row-id', rowIndex)
+                .attr('data-srp-code', data.srp_code.sort);
 
             totalSrpAmount += parseInt(data.srp_costs);
+
             $('.srp-dashboard-total-isk-cost-amount').html(
                 totalSrpAmount.toLocaleString() + ' ISK'
             );
@@ -276,7 +278,8 @@ $(document).ready(() => {
         const url = button.data('url');
         const name = button.data('name');
 
-        modalEnableSrpLink.find('#modal-button-confirm-enable-srp-link').attr('href', url);
+        modalEnableSrpLink.find('#modal-button-confirm-enable-srp-link')
+            .attr('href', url);
         modalEnableSrpLink.find('.modal-body').html(
             aaSrpSettings.translation.modal.enableSrpLink.body + '<br>"' + name + '"'
         );
@@ -290,7 +293,8 @@ $(document).ready(() => {
         const url = button.data('url');
         const name = button.data('name');
 
-        modalDisableSrpLink.find('#modal-button-confirm-disable-srp-link').attr('href', url);
+        modalDisableSrpLink.find('#modal-button-confirm-disable-srp-link')
+            .attr('href', url);
         modalDisableSrpLink.find('.modal-body').html(
             aaSrpSettings.translation.modal.disableSrpLink.body + '<br>"' + name + '"'
         );
@@ -320,14 +324,13 @@ $(document).ready(() => {
         const confirmButtonText = button.data('modal-button-confirm');
 
         modalSrpRequestDetails.find('.modal-title').text(name);
-        modalSrpRequestDetails.find('#modal-button-request-details-confirm').html(confirmButtonText);
+        modalSrpRequestDetails.find('#modal-button-request-details-confirm')
+            .html(confirmButtonText);
 
         $.get({
             url: url,
             success: (data) => {
-                const modalBody = data;
-
-                modalSrpRequestDetails.find('.modal-body').html(modalBody);
+                modalSrpRequestDetails.find('.modal-body').html(data);
             }
         });
     }).on('hide.bs.modal', () => {