mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-18 20:47:54 +00:00
merge
This commit is contained in:
@@ -282,10 +282,4 @@ export class DespachoService {
|
||||
|
||||
}
|
||||
|
||||
/* sortArrayISODate(myArray: any) {
|
||||
return myArray.sort(function(a, b) {
|
||||
return (a.CreateDate < b.CreateDate) ? -1 : ((a.CreateDate > b.CreateDate) ? 1 : 0);
|
||||
});
|
||||
} */
|
||||
|
||||
}
|
||||
|
||||
+13
-13
@@ -5,20 +5,20 @@ postMessage("I\'m working before postMessage(\'ali\').");
|
||||
onmessage = function(oEvent) {
|
||||
postMessage('Hi ' + oEvent.data);
|
||||
|
||||
let request = new XMLHttpRequest();
|
||||
// let request = new XMLHttpRequest();
|
||||
//request.setRequestHeader('Authorization', 'Bearer ' + token);
|
||||
request.onreadystatechange = () => {
|
||||
if (request.readyState === 4) {
|
||||
let result = JSON.parse(request.responseText);
|
||||
// call app back
|
||||
postMessage({
|
||||
name: 'getDataResponse',
|
||||
data: result
|
||||
});
|
||||
}
|
||||
}
|
||||
request.open('GET', "https://api.agify.io/?name=michael", true);
|
||||
request.send();
|
||||
// request.onreadystatechange = () => {
|
||||
// if (request.readyState === 4) {
|
||||
// let result = JSON.parse(request.responseText);
|
||||
// // call app back
|
||||
// postMessage({
|
||||
// name: 'getDataResponse',
|
||||
// data: result
|
||||
// });
|
||||
// }
|
||||
// }
|
||||
// request.open('GET', "https://api.agify.io/?name=michael", true);
|
||||
// request.send();
|
||||
|
||||
};
|
||||
|
||||
|
||||
@@ -22,9 +22,9 @@ export class InativityService {
|
||||
|
||||
function userIsNotActive() {
|
||||
// your function for too long inactivity goes here
|
||||
// SessionStore.setInativity(false)
|
||||
SessionStore.setInativity(false)
|
||||
// alert('go out')
|
||||
// window['inactivity/function']()
|
||||
window['inactivity/function']()
|
||||
}
|
||||
|
||||
function resetTimer() {
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
export let versionData = {
|
||||
"shortSHA": "469057954",
|
||||
"SHA": "46905795443cdbdc03aeab57f214cedef55d3dd9",
|
||||
"shortSHA": "a1aeab4a8",
|
||||
"SHA": "a1aeab4a84d61d3929822002b5dad9fffb313302",
|
||||
"branch": "develop_bitOut-fix",
|
||||
"lastCommitAuthor": "'Peter Maquiran'",
|
||||
"lastCommitTime": "'Fri Dec 30 14:36:16 2022 +0100'",
|
||||
"lastCommitTime": "'Fri Dec 30 14:45:08 2022 +0100'",
|
||||
"lastCommitMessage": "back",
|
||||
"lastCommitNumber": "4596",
|
||||
"lastCommitNumber": "4597",
|
||||
"change": "",
|
||||
"changeStatus": "On branch develop_bitOut-fix\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/Rules/despacho.service.ts\n\tmodified: version/git-version.ts",
|
||||
"changeStatus": "On branch develop_bitOut-fix\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/Rules/despacho.service.ts\n\tmodified: src/app/home/nice.worker.js\n\tmodified: src/app/services/inativity.service.ts",
|
||||
"changeAuthor": "peter.maquiran"
|
||||
}
|
||||
Reference in New Issue
Block a user