mirror of
https://github.com/Karaka-Management/oms-ClientManagement.git
synced 2026-01-11 15:28:41 +00:00
more tests and some fixes
This commit is contained in:
parent
f46cc09c06
commit
12cece6af5
9
.github/workflows/main.yml
vendored
9
.github/workflows/main.yml
vendored
|
|
@ -13,10 +13,15 @@ on:
|
||||||
- cron: '0 0 1,15 * *'
|
- cron: '0 0 1,15 * *'
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
general_module_workflow:
|
general_module_workflow_php:
|
||||||
uses: Karaka-Management/Karaka/.github/workflows/php_template.yml@develop
|
uses: Karaka-Management/Karaka/.github/workflows/php_template.yml@develop
|
||||||
secrets:
|
secrets:
|
||||||
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
GH_PAT: ${{ secrets.GH_PAT }}
|
GH_PAT: ${{ secrets.GH_PAT }}
|
||||||
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
|
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 }}
|
||||||
|
|
@ -3,6 +3,7 @@ import { Autoloader } from '../../jsOMS/Autoloader.js';
|
||||||
|
|
||||||
Autoloader.defineNamespace('omsApp.Modules');
|
Autoloader.defineNamespace('omsApp.Modules');
|
||||||
|
|
||||||
|
/* global omsApp */
|
||||||
omsApp.Modules.ClientManagement = class {
|
omsApp.Modules.ClientManagement = class {
|
||||||
/**
|
/**
|
||||||
* @constructor
|
* @constructor
|
||||||
|
|
@ -45,12 +46,11 @@ omsApp.Modules.ClientManagement = class {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
const self = this;
|
|
||||||
const data = JSON.parse(chart.getAttribute('data-chart'));
|
const data = JSON.parse(chart.getAttribute('data-chart'));
|
||||||
|
|
||||||
/** global: Chart */
|
/* global Chart */
|
||||||
|
// eslint-disable-next-line no-unused-vars
|
||||||
const myChart = new Chart(chart.getContext('2d'), data);
|
const myChart = new Chart(chart.getContext('2d'), data);
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
bindMap (map)
|
bindMap (map)
|
||||||
|
|
@ -61,7 +61,7 @@ omsApp.Modules.ClientManagement = class {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
/** global: OpenLayers */
|
/* global OpenLayers */
|
||||||
const mapObj = new OpenLayers.Map(map.getAttribute('id'), {
|
const mapObj = new OpenLayers.Map(map.getAttribute('id'), {
|
||||||
controls: [
|
controls: [
|
||||||
new OpenLayers.Control.Navigation(
|
new OpenLayers.Control.Navigation(
|
||||||
|
|
@ -77,12 +77,12 @@ omsApp.Modules.ClientManagement = class {
|
||||||
|
|
||||||
mapObj.addLayer(new OpenLayers.Layer.OSM());
|
mapObj.addLayer(new OpenLayers.Layer.OSM());
|
||||||
|
|
||||||
const fromProjection = new OpenLayers.Projection("EPSG:4326"); // Transform from WGS 1984
|
const fromProjection = new OpenLayers.Projection('EPSG:4326'); // Transform from WGS 1984
|
||||||
const toProjection = new OpenLayers.Projection("EPSG:900913"); // to Spherical Mercator Projection
|
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 position = new OpenLayers.LonLat(map.getAttribute('data-lon'), map.getAttribute('data-lat')).transform(fromProjection, toProjection);
|
||||||
const zoom = 12;
|
const zoom = 12;
|
||||||
|
|
||||||
const markers = new OpenLayers.Layer.Markers("Markers");
|
const markers = new OpenLayers.Layer.Markers('Markers');
|
||||||
mapObj.addLayer(markers);
|
mapObj.addLayer(markers);
|
||||||
|
|
||||||
markers.addMarker(new OpenLayers.Marker(position));
|
markers.addMarker(new OpenLayers.Marker(position));
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user