Jingga/oms-Accounting
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Accounting.git synced 2026-01-10 21:08:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

more tests and some fixes

Browse Source
This commit is contained in:
Dennis Eichhorn 2024-04-24 03:20:46 +00:00
parent 5532981071
commit 4530d6eb97
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.github/workflows/main.yml vendored
View File

@ -13,10 +13,15 @@ on:
- cron: '0 0 1,15 * *'
jobs:
general_module_workflow:
general_module_workflow_php:
uses: Karaka-Management/Karaka/.github/workflows/php_template.yml@develop
secrets:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GH_PAT: ${{ secrets.GH_PAT }}
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
general_module_workflow_js:
uses: Karaka-Management/Karaka/.github/workflows/js_template.yml@develop
secrets:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GH_PAT: ${{ secrets.GH_PAT }}
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

12
Controller.js
View File

@ -3,6 +3,7 @@ import { Autoloader } from '../../jsOMS/Autoloader.js';
Autoloader.defineNamespace('omsApp.Modules');
/* global omsApp */
omsApp.Modules.Accounting = class {
/**
* @constructor
@ -45,11 +46,11 @@ omsApp.Modules.Accounting = class {
return;
}
const self = this;
const data = JSON.parse(chart.getAttribute('data-chart'));
/* global Chart */
// eslint-disable-next-line no-unused-vars
const myChart = new Chart(chart.getContext('2d'), data);
};
bindMap (map)
@ -60,6 +61,7 @@ omsApp.Modules.Accounting = class {
return;
}
/* global OpenLayers */
const mapObj = new OpenLayers.Map(map.getAttribute('id'), {
controls: [
new OpenLayers.Control.Navigation(
@ -75,12 +77,12 @@ omsApp.Modules.Accounting = class {
mapObj.addLayer(new OpenLayers.Layer.OSM());
const fromProjection = new OpenLayers.Projection("EPSG:4326"); // Transform from WGS 1984
const toProjection = new OpenLayers.Projection("EPSG:900913"); // to Spherical Mercator Projection
const fromProjection = new OpenLayers.Projection('EPSG:4326'); // Transform from WGS 1984
const toProjection = new OpenLayers.Projection('EPSG:900913'); // to Spherical Mercator Projection
const position = new OpenLayers.LonLat(map.getAttribute('data-lon'), map.getAttribute('data-lat')).transform(fromProjection, toProjection);
const zoom = 12;
const markers = new OpenLayers.Layer.Markers("Markers");
const markers = new OpenLayers.Layer.Markers('Markers');
mapObj.addLayer(markers);
markers.addMarker(new OpenLayers.Marker(position));