From 822ffd52425ff136a8d9d9468d6c1eb038bfc3e4 Mon Sep 17 00:00:00 2001 From: flux Date: Tue, 1 Jan 2019 20:18:04 +0100 Subject: [PATCH] - fixed wrong day on negative UTC offset bug - added info description functionality - added full and empty decans - added some descriptions --- index.html | 2 +- js/SL.Calendar.js | 15 +- js/modules/astrology.js | 168 ++++++------- js/modules/decans.js | 525 +++++++++++++++++++++++++++++----------- js/modules/pgm.js | 1 + 5 files changed, 478 insertions(+), 233 deletions(-) diff --git a/index.html b/index.html index eca0315..65ca32f 100644 --- a/index.html +++ b/index.html @@ -255,7 +255,7 @@ 'sun', 'moon', 'mercury', 'venus', 'mars', 'jupiter', 'saturn', 'ascendant', 'aspects', 'motion', 'lunarmansion', - 'decans_solar', 'decans_rising', + 'decans_solar', 'decans_rising', 'decans_fulldegrees', 'decans_fulldegrees_rising', 'pgm_lsign', 'pgm_civildate', 'hygromanteia_hours', 'hygromanteia_lunarday', diff --git a/js/SL.Calendar.js b/js/SL.Calendar.js index 35597c3..91d85e1 100644 --- a/js/SL.Calendar.js +++ b/js/SL.Calendar.js @@ -134,10 +134,14 @@ SL.Calendar = (function() { alert("Sorry, the calculation is limited to 60 days at the moment! Calculating the first 60 out of your desired "+days+" days!"); days = 60; } - $('#caption .stoke').html('calculating...please wait'); + $('#caption .stoke').html('calculating ephemeris...please wait'); $("#grid").empty(); $('#download').remove(); Filter.load(); + // check if negative UTC offset will be before the beginning of UTC day and if yes, go back one day. + if ( moment.unix(ts).startOf('day') > moment.unix(ts).add( $("#offset").val(), 'hours') ) { + ts = moment.unix(ts).subtract(1, 'day').utc().unix(); + } var files = document.getElementById('fileInput').files; // check if JSON file is loaded. If not, calculate... if (files.length <= 0) { @@ -148,6 +152,7 @@ SL.Calendar = (function() { }) .then(function(json) { Hours.moments = json.query; + $('#caption .stoke').html('generating planetary hours...please wait'); for (var i = 0, len = Hours.moments.length; i < len; i++) { var everyday = setTimeout( Hour.make, 10, Hours.moments[i], i, Hours.moments.length, everyday); NProgress.set(i/Hours.moments.length); @@ -168,6 +173,7 @@ SL.Calendar = (function() { return false; } Hours.moments = result.query; + $('#caption .stoke').html('generating planetary hours...please wait'); if ( Hours.moments.length > 0 ) { for (var i = 0, len = Hours.moments.length; i < len; i++) { var everyday = setTimeout( Hour.make, 10, Hours.moments[i], i, Hours.moments.length, everyday); @@ -483,6 +489,7 @@ SL.Calendar = (function() { mod.forEach(function(m) { extend(m, eval('module_'+m)); }); + $('[data-toggle="tooltip"]').tooltip(); } /** @@ -493,10 +500,14 @@ SL.Calendar = (function() { function extend(name,plugin) { modules[name] = plugin; var groupname = ''; + var tooltip = ''; var checked = ''; if ( plugin.definitions.hasOwnProperty("core") && plugin.definitions.core == true ) checked = "checked"; if ( plugin.definitions.hasOwnProperty("group") ) groupname = ""+plugin.definitions.group.text+" "; - $("#moduleSelect").append(''); + if ( plugin.definitions.hasOwnProperty("description") ) { + tooltip = ' '; + } + $("#moduleSelect").append(''); } /** diff --git a/js/modules/astrology.js b/js/modules/astrology.js index a08d5f1..95f4038 100644 --- a/js/modules/astrology.js +++ b/js/modules/astrology.js @@ -19,16 +19,16 @@ var module_moon = { [{ "id": "1", "action": "Moon in Aries", - "tags": "moon aries", + "tags": "moon aries mars", "hide": "info" }], [{ "id": "2", "action": "Moon in Taurus (Exalted)", - "tags": "moon taurus exalted" + "tags": "moon taurus venus exalted" }], [{ "id": "3", "action": "Moon in Gemini", - "tags": "moon gemini", + "tags": "moon gemini mercury", "hide": "info" }], [{ "id": "4", @@ -37,40 +37,40 @@ var module_moon = { }], [{ "id": "5", "action": "Moon in Leo", - "tags": "moon leo", + "tags": "moon leo sun", "hide": "info" }], [{ "id": "6", "action": "Moon in Virgo", - "tags": "moon virgo", + "tags": "moon virgo mercury", "hide": "info" }], [{ "id": "7", "action": "Moon in Libra", - "tags": "moon libra", + "tags": "moon libra venus", "hide": "info" }], [{ "id": "8", "action": "Moon in Scorpio (Fall)", - "tags": "moon scorpio fall" + "tags": "moon scorpio mars fall" }], [{ "id": "9", "action": "Moon in Sagittarius", - "tags": "moon sagittarius", + "tags": "moon sagittarius jupiter", "hide": "info" }], [{ "id": "10", "action": "Moon in Capricorn (Detriment)", - "tags": "moon capricorn detriment" + "tags": "moon capricorn saturn detriment" }], [{ "id": "11", "action": "Moon in Aquarius", - "tags": "moon aquarius", + "tags": "moon aquarius saturn", "hide": "info" }], [{ "id": "12", "action": "Moon in Pisces", - "tags": "moon pisces", + "tags": "moon pisces jupiter", "hide": "info" }] ] @@ -99,12 +99,12 @@ var module_mercury = { [{ "id": "1", "action": "Mercury in Aries", - "tags": "mercury aries", + "tags": "mercury aries mars", "hide": "info" }], [{ "id": "2", "action": "Mercury in Taurus", - "tags": "mercury taurus", + "tags": "mercury taurus venus", "hide": "info" }], [{ "id": "3", @@ -113,12 +113,12 @@ var module_mercury = { }], [{ "id": "4", "action": "Mercury in Cancer", - "tags": "cancer mercury", + "tags": "cancer moon mercury", "hide": "info" }], [{ "id": "5", "action": "Mercury in Leo", - "tags": "mercury leo", + "tags": "mercury leo sun", "hide": "info" }], [{ "id": "6", @@ -127,31 +127,31 @@ var module_mercury = { }], [{ "id": "7", "action": "Mercury in Libra", - "tags": "mercury libra", + "tags": "mercury libra venus", "hide": "info" }], [{ "id": "8", "action": "Mercury in Scorpio", - "tags": "mercury scorpio", + "tags": "mercury scorpio mars", "hide": "info" }], [{ "id": "9", "action": "Mercury in Sagittarius (Detriment)", - "tags": "mercury sagittarius detriment" + "tags": "mercury sagittarius jupiter detriment" }], [{ "id": "10", "action": "Mercury in Capricorn", - "tags": "mercury capricorn", + "tags": "mercury capricorn saturn", "hide": "info" }], [{ "id": "11", "action": "Mercury in Aquarius", - "tags": "mercury aquarius", + "tags": "mercury aquarius saturn", "hide": "info" }], [{ "id": "12", "action": "Mercury in Pisces (Fall)", - "tags": "mercury pisces fall" + "tags": "mercury pisces jupiter fall" }] ] }, @@ -179,7 +179,7 @@ var module_venus = { [{ "id": "1", "action": "Venus in Aries (Detriment)", - "tags": "venus aries detriment" + "tags": "venus aries mars detriment" }], [{ "id": "2", "action": "Venus in Taurus", @@ -188,22 +188,22 @@ var module_venus = { }], [{ "id": "3", "action": "Venus in Gemini", - "tags": "venus gemini", + "tags": "venus gemini mercury", "hide": "info" }], [{ "id": "4", "action": "Venus in Cancer", - "tags": "cancer venus", + "tags": "cancer moon venus", "hide": "info" }], [{ "id": "5", "action": "Venus in Leo", - "tags": "venus leo", + "tags": "venus leo sun", "hide": "info" }], [{ "id": "6", "action": "Venus in Virgo (Fall)", - "tags": "venus virgo fall" + "tags": "venus virgo mercury fall" }], [{ "id": "7", "action": "Venus in Libra (Domicile)", @@ -211,26 +211,26 @@ var module_venus = { }], [{ "id": "8", "action": "Venus in Scorpio (Detriment)", - "tags": "venus scorpio detriment" + "tags": "venus scorpio mars detriment" }], [{ "id": "9", "action": "Venus in Sagittarius", - "tags": "venus sagittarius", + "tags": "venus sagittarius jupiter", "hide": "info" }], [{ "id": "10", "action": "Venus in Capricorn", - "tags": "venus capricorn", + "tags": "venus capricorn saturn", "hide": "info" }], [{ "id": "11", "action": "Venus in Aquarius", - "tags": "venus aquarius", + "tags": "venus aquarius saturn", "hide": "info" }], [{ "id": "12", "action": "Venus in Pisces (Exaltation)", - "tags": "venus pisces exaltation" + "tags": "venus pisces jupiter exaltation" }] ] }, @@ -258,21 +258,21 @@ var module_sun = { [{ "id": "1", "action": "Sun in Aries (Exaltation)", - "tags": "sun aries exaltation" + "tags": "sun aries mars exaltation" }], [{ "id": "2", "action": "Sun in Taurus", - "tags": "sun taurus", + "tags": "sun taurus venus", "hide": "info" }], [{ "id": "3", "action": "Sun in Gemini", - "tags": "sun gemini", + "tags": "sun gemini mercury", "hide": "info" }], [{ "id": "4", "action": "Sun in Cancer", - "tags": "cancer sun", + "tags": "cancer moon sun", "hide": "info" }], [{ "id": "5", @@ -281,35 +281,35 @@ var module_sun = { }], [{ "id": "6", "action": "Sun in Virgo", - "tags": "sun virgo", + "tags": "sun virgo mercury", "hide": "info" }], [{ "id": "7", "action": "Sun in Libra (Fall)", - "tags": "sun libra fall" + "tags": "sun libra venus fall" }], [{ "id": "8", "action": "Sun in Scorpio", - "tags": "sun scorpio", + "tags": "sun scorpio mars", "hide": "info" }], [{ "id": "9", "action": "Sun in Sagittarius", - "tags": "sun sagittarius", + "tags": "sun sagittarius jupiter", "hide": "info" }], [{ "id": "10", "action": "Sun in Capricorn", - "tags": "sun capricorn", + "tags": "sun capricorn saturn", "hide": "info" }], [{ "id": "11", "action": "Sun in Aquarius (Detriment)", - "tags": "sun aquarius detriment" + "tags": "sun aquarius saturn detriment" }], [{ "id": "12", "action": "Sun in Pisces", - "tags": "sun pisces", + "tags": "sun pisces jupiter", "hide": "info" }] ] @@ -342,30 +342,30 @@ var module_mars = { }], [{ "id": "2", "action": "Mars in Taurus (Detriment)", - "tags": "mars taurus detriment" + "tags": "mars taurus venus detriment" }], [{ "id": "3", "action": "Mars in Gemini", - "tags": "mars gemini", + "tags": "mars gemini mercury", "hide": "info" }], [{ "id": "4", "action": "Mars in Cancer (Fall)", - "tags": "cancer mars fall" + "tags": "cancer moon mars fall" }], [{ "id": "5", "action": "Mars in Leo", - "tags": "mars leo", + "tags": "mars leo sun", "hide": "info" }], [{ "id": "6", "action": "Mars in Virgo", - "tags": "mars virgo", + "tags": "mars virgo mercury", "hide": "info" }], [{ "id": "7", "action": "Mars in Libra (Detriment)", - "tags": "mars libra detriment" + "tags": "mars libra venus detriment" }], [{ "id": "8", "action": "Mars in Scorpio (Domicile)", @@ -373,21 +373,21 @@ var module_mars = { }], [{ "id": "9", "action": "Mars in Sagittarius", - "tags": "mars sagittarius", + "tags": "mars sagittarius jupiter", "hide": "info" }], [{ "id": "10", "action": "Mars in Capricorn (Exalted)", - "tags": "mars capricorn exalted" + "tags": "mars capricorn saturn exalted" }], [{ "id": "11", "action": "Mars in Aquarius", - "tags": "mars aquarius", + "tags": "mars aquarius saturn", "hide": "info" }], [{ "id": "12", "action": "Mars in Pisces", - "tags": "mars pisces", + "tags": "mars pisces jupiter", "hide": "info" }] ] @@ -416,39 +416,39 @@ var module_jupiter = { [{ "id": "1", "action": "Jupiter in Aries", - "tags": "jupiter aries", + "tags": "jupiter aries mars", "hide": "info" }], [{ "id": "2", "action": "Jupiter in Taurus", - "tags": "jupiter taurus", + "tags": "jupiter taurus venus", "hide": "info" }], [{ "id": "3", "action": "Jupiter in Gemini (Detriment)", - "tags": "jupiter gemini detriment" + "tags": "jupiter gemini mercury detriment" }], [{ "id": "4", "action": "Jupiter in Cancer (Exaltation)", - "tags": "cancer jupiter exaltation" + "tags": "cancer moon jupiter exaltation" }], [{ "id": "5", "action": "Jupiter in Leo", - "tags": "jupiter leo", + "tags": "jupiter leo sun", "hide": "info" }], [{ "id": "6", "action": "Jupiter in Virgo (Detriment)", - "tags": "jupiter virgo detriment" + "tags": "jupiter virgo mercury detriment" }], [{ "id": "7", "action": "Jupiter in Libra", - "tags": "jupiter libra", + "tags": "jupiter libra venus", "hide": "info" }], [{ "id": "8", "action": "Jupiter in Scorpio", - "tags": "jupiter scorpio", + "tags": "jupiter scorpio mars", "hide": "info" }], [{ "id": "9", @@ -457,11 +457,11 @@ var module_jupiter = { }], [{ "id": "10", "action": "Jupiter in Capricorn (Fall)", - "tags": "jupiter capricorn fall" + "tags": "jupiter capricorn saturn fall" }], [{ "id": "11", "action": "Jupiter in Aquarius", - "tags": "jupiter aquarius", + "tags": "jupiter aquarius saturn", "hide": "info" }], [{ "id": "12", @@ -494,43 +494,43 @@ var module_saturn = { [{ "id": "1", "action": "Saturn in Aries (Fall)", - "tags": "saturn aries fall" + "tags": "saturn aries mars fall" }], [{ "id": "2", "action": "Saturn in Taurus", - "tags": "saturn taurus", + "tags": "saturn taurus venus", "hide": "info" }], [{ "id": "3", "action": "Saturn in Gemini)", - "tags": "saturn gemini", + "tags": "saturn gemini mercury", "hide": "info" }], [{ "id": "4", "action": "Saturn in Cancer (Detriment)", - "tags": "cancer saturn detriment" + "tags": "cancer moon saturn detriment" }], [{ "id": "5", "action": "Saturn in Leo (Detriment)", - "tags": "saturn leo detriment" + "tags": "saturn leo sun detriment" }], [{ "id": "6", "action": "Saturn in Virgo", - "tags": "saturn virgo", + "tags": "saturn virgo mercury", "hide": "info" }], [{ "id": "7", "action": "Saturn in Libra (Exaltation)", - "tags": "saturn libra exaltation" + "tags": "saturn libra venus exaltation" }], [{ "id": "8", "action": "Saturn in Scorpio", - "tags": "saturn scorpio", + "tags": "saturn scorpio mars", "hide": "info" }], [{ "id": "9", "action": "Saturn in Sagittarius", - "tags": "saturn sagittarius", + "tags": "saturn sagittarius jupiter", "hide": "info" }], [{ "id": "10", @@ -543,7 +543,7 @@ var module_saturn = { }], [{ "id": "12", "action": "Saturn in Pisces", - "tags": "saturn pisces", + "tags": "saturn pisces jupiter", "hide": "info" }] ] @@ -572,51 +572,51 @@ var module_ascendant = { [{ "id": "1", "action": "Aries Rising", - "tags": "aries" + "tags": "aries mars" }], [{ "id": "2", "action": "Taurus Rising", - "tags": "taurus" + "tags": "taurus venus" }], [{ "id": "3", "action": "Gemini Rising", - "tags": "gemini" + "tags": "gemini mercury" }], [{ "id": "4", "action": "Cancer Rising", - "tags": "cancer" + "tags": "cancer moon" }], [{ "id": "5", "action": "Leo Rising", - "tags": "leo" + "tags": "leo sun" }], [{ "id": "6", "action": "Virgo Rising", - "tags": "virgo" + "tags": "virgo mercury" }], [{ "id": "7", "action": "Libra Rising", - "tags": "libra" + "tags": "libra venus" }], [{ "id": "8", "action": "Scorpio Rising", - "tags": "scorpio" + "tags": "scorpio mars" }], [{ "id": "9", "action": "Sagittarius Rising", - "tags": "sagittarius" + "tags": "sagittarius jupiter" }], [{ "id": "10", "action": "Capricorn Rising", - "tags": "capricorn" + "tags": "capricorn saturn" }], [{ "id": "11", "action": "Aquarius Rising", - "tags": "aquarius" + "tags": "aquarius saturn" }], [{ "id": "12", "action": "Pisces Rising", - "tags": "pisces" + "tags": "pisces jupiter" }] ] }, diff --git a/js/modules/decans.js b/js/modules/decans.js index 3fdd873..a3861e6 100644 --- a/js/modules/decans.js +++ b/js/modules/decans.js @@ -8,6 +8,7 @@ var module_decans_solar = { definitions: { name: "Solar Decade", + description: "The Decade is the Sun's position in a third of a Zodiac sign, also known as Decan, derived from Egyptian astrology.", group: { id: "decans", text: "Decans", @@ -18,253 +19,253 @@ var module_decans_solar = { [ { "id":28, - "action":"Aries 1: Chontare / Senator", - "tags":"chontare senator aries1" + "action":"Aries 1: Chontare", + "tags":"chontare senator aries1 aries" } ], [ { "id":29, - "action":"Aries 2: Chontachre / Senacher", - "tags":"chontachre senacher aries2" + "action":"Aries 2: Chontachre", + "tags":"chontachre senacher aries2 aries" } ], [ { "id":30, - "action":"Aries 3: Siket / Sentacher", - "tags":"siket sentacher aries3" + "action":"Aries 3: Siket", + "tags":"siket sentacher aries3 aries" } ], [ { "id":31, - "action":"Taurus 1: Chôou / Suo", - "tags":"choou suo taurus1" + "action":"Taurus 1: Chôou", + "tags":"choou suo taurus1 taurus" } ], [ { "id":32, - "action":"Taurus 2: Erô / Aryo", - "tags":"ero aryo taurus2" + "action":"Taurus 2: Erô", + "tags":"ero aryo taurus2 taurus" } ], [ { "id":33, - "action":"Taurus 3: Hrombromare / Romanae", - "tags":"hrombromare romanae taurus3" + "action":"Taurus 3: Hrombromare", + "tags":"hrombromare romanae taurus3 taurus" } ], [ { "id":34, - "action":"Gemini 1: Thosolk / Thesogar", - "tags":"thosolk thesogar gemini1" + "action":"Gemini 1: Thosolk", + "tags":"thosolk thesogar gemini1 gemini" } ], [ { "id":35, - "action":"Gemini 2: Ouare / Ver", - "tags":"ouare ver gemini2" + "action":"Gemini 2: Ouare", + "tags":"ouare ver gemini2 gemini" } ], [ { "id":36, - "action":"Gemini 3: Phouori / Tepis", - "tags":"phouori tepis gemini3" + "action":"Gemini 3: Phouori", + "tags":"phouori tepis gemini3 gemini" } ], [ { "id":1, - "action":"Cancer 1: Sôthis / Sothis", - "tags":"sothis sothis cancer1" + "action":"Cancer 1: Sôthis", + "tags":"sothis sothis cancer1 cancer" } ], [ { "id":2, - "action":"Cancer 2: Sit / Sith", - "tags":"sit sith cancer2" + "action":"Cancer 2: Sit", + "tags":"sit sith cancer2 cancer" } ], [ { "id":3, - "action":"Cancer 3: Chnoumis / Thiumis", - "tags":"chnoumis thiumis cancer3" + "action":"Cancer 3: Chnoumis", + "tags":"chnoumis thiumis cancer3 cancer" } ], [ { "id":4, - "action":"Leo 1: Charchnoumis / Craumonis", - "tags":"charchnoumis craumonis leo1" + "action":"Leo 1: Charchnoumis", + "tags":"charchnoumis craumonis leo1 leo" } ], [ { "id":5, - "action":"Leo 2: Êpê / Sic", - "tags":"epe sic leo2" + "action":"Leo 2: Êpê", + "tags":"epe sic leo2 leo" } ], [ { "id":6, - "action":"Leo 3: Phoupê / Futile", - "tags":"phoupe futile leo3" + "action":"Leo 3: Phoupê", + "tags":"phoupe futile leo3 leo" } ], [ { "id":7, - "action":"Virgo 1: Tôm / Thumis", - "tags":"tom thumis virgo1" + "action":"Virgo 1: Tôm", + "tags":"tom thumis virgo1 virgo" } ], [ { "id":8, - "action":"Virgo 2: Ouestebkôt / Tophicus", - "tags":"ouestebkot tophicus virgo2" + "action":"Virgo 2: Ouestebkôt", + "tags":"ouestebkot tophicus virgo2 virgo" } ], [ { "id":9, - "action":"Virgo 3: Aphoso / Afut", - "tags":"aphoso afut virgo3" + "action":"Virgo 3: Aphoso", + "tags":"aphoso afut virgo3 virgo" } ], [ { "id":10, - "action":"Libra 1: Souchôe / Seuichut", - "tags":"souchoe seuichut libra1" + "action":"Libra 1: Souchôe", + "tags":"souchoe seuichut libra1 libra" } ], [ { "id":11, - "action":"Libra 2: Ptêchout / Sepisent", - "tags":"ptechout sepisent libra2" + "action":"Libra 2: Ptêchout", + "tags":"ptechout sepisent libra2 libra" } ], [ { "id":12, - "action":"Libra 3: Chontare / Senta", - "tags":"chontare senta libra3" + "action":"Libra 3: Chontare", + "tags":"chontare senta libra3 libra" } ], [ { "id":13, - "action":"Scorpio 1: Stôchnêne / Sentacer", - "tags":"stochnene sentacer scorpio1" + "action":"Scorpio 1: Stôchnêne", + "tags":"stochnene sentacer scorpio1 scorpio" } ], [ { "id":14, - "action":"Scorpio 2: Sesme / Tepsisen", - "tags":"sesme tepsisen scorpio2" + "action":"Scorpio 2: Sesme", + "tags":"sesme tepsisen scorpio2 scorpio" } ], [ { "id":15, - "action":"Scorpio 3: Sisieme / Sentineu", - "tags":"sisieme sentineu scorpio3" + "action":"Scorpio 3: Sisieme", + "tags":"sisieme sentineu scorpio3 scorpio" } ], [ { "id":16, - "action":"Sagittarius 1: Hrêouô / Eregbuo", - "tags":"hreouo eregbuo sagittarius1" + "action":"Sagittarius 1: Hrêouô", + "tags":"hreouo eregbuo sagittarius1 sagittarius" } ], [ { "id":17, - "action":"Sagittarius 2: Sesme / Sagon", - "tags":"sesme sagon sagittarius2" + "action":"Sagittarius 2: Sesme", + "tags":"sesme sagon sagittarius2 sagittarius" } ], [ { "id":18, - "action":"Sagittarius 3: Komme / Chenene", - "tags":"komme chenene sagittarius3" + "action":"Sagittarius 3: Komme", + "tags":"komme chenene sagittarius3 sagittarius" } ], [ { "id":19, - "action":"Capricorn 1: Smat / Themeso", - "tags":"smat themeso capricorn1" + "action":"Capricorn 1: Smat", + "tags":"smat themeso capricorn1 capricorn" } ], [ { "id":20, - "action":"Capricorn 2: Srô / Epiemu", - "tags":"sro epiemu capricorn2" + "action":"Capricorn 2: Srô", + "tags":"sro epiemu capricorn2 capricorn" } ], [ { "id":21, - "action":"Capricorn 3: Isrô / Omot", - "tags":"isro omot capricorn3" + "action":"Capricorn 3: Isrô", + "tags":"isro omot capricorn3 capricorn" } ], [ { "id":22, - "action":"Aquarius 1: Ptiau / Oro", - "tags":"ptiau oro aquarius1" + "action":"Aquarius 1: Ptiau", + "tags":"ptiau oro aquarius1 aquarius" } ], [ { "id":23, - "action":"Aquarius 2: Aue / Cratero", - "tags":"aue cratero aquarius2" + "action":"Aquarius 2: Aue", + "tags":"aue cratero aquarius2 aquarius" } ], [ { "id":24, - "action":"Aquarius 3: Ptêbuou / Tepis", - "tags":"ptebuou tepis aquarius3" + "action":"Aquarius 3: Ptêbuou", + "tags":"ptebuou tepis aquarius3 aquarius" } ], [ { "id":25, - "action":"Pisces 1: Biou / Acha", - "tags":"biou acha pisces1" + "action":"Pisces 1: Biou", + "tags":"biou acha pisces1 pisces" } ], [ { "id":26, - "action":"Pisces 2: Chontare / Tepibui", - "tags":"chontare tepibui pisces2" + "action":"Pisces 2: Chontare", + "tags":"chontare tepibui pisces2 pisces" } ], [ { "id":27, - "action":"Pisces 3: Ptibiou / Uiu", - "tags":"ptibiou uiu pisces3" + "action":"Pisces 3: Ptibiou", + "tags":"ptibiou uiu pisces3 pisces" } ] ] @@ -282,6 +283,30 @@ var module_decans_rising = { definitions: { name: "Rising Decan", + description: "The Decan (third of a Zodiac sign, derived from Egyptian astrology) that is rising.", + group: { + id: "decans", + text: "Decans", + info: "true" + }, + actions: module_decans_solar.definitions.actions + }, + property: function(m) { + return SL.Astro.Logy.getZodiac(m.ephemeris.asc.deg).decan; + }, + calculate: function(definitions, property) { + var a = definitions.actions[property]; + a[0].action += " rising"; + return a; + } +}; + +//Defines Calendar Objects and Methods +var module_decans_fulldegrees = { + + definitions: { + name: "Full + Empty", + description: "Full and empty degrees of the Decans, according to Firmicus Maternus 'Ancient Astrology', Book 4, XXII", group: { id: "decans", text: "Decans", @@ -292,261 +317,469 @@ var module_decans_rising = { [ { "id":28, - "action":"Aries 1 rising: Chontare / Senator", - "tags":"chontare senator aries1" + "action":"Aries 1: full (Senator)", + "tags":"full senator aries" } ], [ { "id":29, - "action":"Aries 2 rising: Chontachre / Senacher", - "tags":"chontachre senacher aries2" + "action":"Aries 2: full (Senacher)", + "tags":"full senacher aries" } ], [ { "id":30, - "action":"Aries 3 rising: Siket / Sentacher", - "tags":"siket sentacher aries3" + "action":"Aries 3: full (Sentacher)", + "tags":"full sentacher aries" } ], [ { "id":31, - "action":"Taurus 1 rising: Chôou / Suo", - "tags":"choou suo taurus1" + "action":"Taurus 1: full (Suo)", + "tags":"full suo taurus" } ], [ { "id":32, - "action":"Taurus 2 rising: Erô / Aryo", - "tags":"ero aryo taurus2" + "action":"Taurus 2: full (Aryo)", + "tags":"full aryo taurus" } ], [ { "id":33, - "action":"Taurus 3 rising: Hrombromare / Romanae", - "tags":"hrombromare romanae taurus3" + "action":"Taurus 3: full (Romanae)", + "tags":"full romanae taurus" } ], [ { "id":34, - "action":"Gemini 1 rising: Thosolk / Thesogar", - "tags":"thosolk thesogar gemini1" + "action":"Gemini 1: full (Thesogar)", + "tags":"full thesogar gemini" } ], [ { "id":35, - "action":"Gemini 2 rising: Ouare / Ver", - "tags":"ouare ver gemini2" + "action":"Gemini 2: full (Ver)", + "tags":"full ver gemini" } ], [ { "id":36, - "action":"Gemini 3 rising: Phouori / Tepis", - "tags":"phouori tepis gemini3" + "action":"Gemini 3: full (Tepis)", + "tags":"full tepis gemini" } ], [ { "id":1, - "action":"Cancer 1 rising: Sôthis / Sothis", - "tags":"sothis sothis cancer1" + "action":"Cancer 1: full (Sothis)", + "tags":"sothis sothis cancer" } ], [ { "id":2, - "action":"Cancer 2 rising: Sit / Sith", - "tags":"sit sith cancer2" + "action":"Cancer 2: full (Sith)", + "tags":"full sith cancer" } ], [ { "id":3, - "action":"Cancer 3 rising: Chnoumis / Thiumis", - "tags":"chnoumis thiumis cancer3" + "action":"Cancer 3: full (Thiumis)", + "tags":"full thiumis cancer" } ], [ { "id":4, - "action":"Leo 1 rising: Charchnoumis / Craumonis", - "tags":"charchnoumis craumonis leo1" + "action":"Leo 1: full (Craumonis)", + "tags":"full craumonis leo" } ], [ { "id":5, - "action":"Leo 2 rising: Êpê / Sic", - "tags":"epe sic leo2" + "action":"Leo 2: full (Sic)", + "tags":"full sic leo" } ], [ { "id":6, - "action":"Leo 3 rising: Phoupê / Futile", - "tags":"phoupe futile leo3" + "action":"Leo 3: full (Futile)", + "tags":"full futile leo" } ], [ { "id":7, - "action":"Virgo 1 rising: Tôm / Thumis", - "tags":"tom thumis virgo1" + "action":"Virgo 1: full (Thumis)", + "tags":"full thumis virgo" } ], [ { "id":8, - "action":"Virgo 2 rising: Ouestebkôt / Tophicus", - "tags":"ouestebkot tophicus virgo2" + "action":"Virgo 2: full (Tophicus)", + "tags":"full tophicus virgo" } ], [ { "id":9, - "action":"Virgo 3 rising: Aphoso / Afut", - "tags":"aphoso afut virgo3" + "action":"Virgo 3: full (Afut)", + "tags":"full afut virgo" } ], [ { "id":10, - "action":"Libra 1 rising: Souchôe / Seuichut", - "tags":"souchoe seuichut libra1" + "action":"Libra 1: full (Seuichut)", + "tags":"full seuichut libra" } ], [ { "id":11, - "action":"Libra 2 rising: Ptêchout / Sepisent", - "tags":"ptechout sepisent libra2" + "action":"Libra 2: full (Sepisent)", + "tags":"full sepisent libra" } ], [ { "id":12, - "action":"Libra 3 rising: Chontare / Senta", - "tags":"chontare senta libra3" + "action":"Libra 3: full (Senta)", + "tags":"full senta libra" } ], [ { "id":13, - "action":"Scorpio 1 rising: Stôchnêne / Sentacer", - "tags":"stochnene sentacer scorpio1" + "action":"Scorpio 1: full (Sentacer)", + "tags":"full sentacer scorpio" } ], [ { "id":14, - "action":"Scorpio 2 rising: Sesme / Tepsisen", - "tags":"sesme tepsisen scorpio2" + "action":"Scorpio 2: full (Tepsisen)", + "tags":"full tepsisen scorpio" } ], [ { "id":15, - "action":"Scorpio 3 rising: Sisieme / Sentineu", - "tags":"sisieme sentineu scorpio3" + "action":"Scorpio 3: full (Sentineu)", + "tags":"full sentineu scorpio" } ], [ { "id":16, - "action":"Sagittarius 1 rising: Hrêouô / Eregbuo", - "tags":"hreouo eregbuo sagittarius1" + "action":"Sagittarius 1: full (Eregbuo)", + "tags":"full eregbuo sagittarius" } ], [ { "id":17, - "action":"Sagittarius 2 rising: Sesme / Sagon", - "tags":"sesme sagon sagittarius2" + "action":"Sagittarius 2: full (Sagon)", + "tags":"full sagon sagittarius" } ], [ { "id":18, - "action":"Sagittarius 3 rising: Komme / Chenene", - "tags":"komme chenene sagittarius3" + "action":"Sagittarius 3: full (Chenene)", + "tags":"full chenene sagittarius" } ], [ { "id":19, - "action":"Capricorn 1 rising: Smat / Themeso", - "tags":"smat themeso capricorn1" + "action":"Capricorn 1: full (Themeso)", + "tags":"full themeso capricorn" } ], [ { "id":20, - "action":"Capricorn 2 rising: Srô / Epiemu", - "tags":"sro epiemu capricorn2" + "action":"Capricorn 2: full (Epiemu)", + "tags":"full epiemu capricorn" } ], [ { "id":21, - "action":"Capricorn 3 rising: Isrô / Omot", - "tags":"isro omot capricorn3" + "action":"Capricorn 3: full (Omot)", + "tags":"full omot capricorn" } ], [ { "id":22, - "action":"Aquarius 1 rising: Ptiau / Oro", - "tags":"ptiau oro aquarius1" + "action":"Aquarius 1: full (Oro)", + "tags":"full oro aquarius" } ], [ { "id":23, - "action":"Aquarius 2 rising: Aue / Cratero", - "tags":"aue cratero aquarius2" + "action":"Aquarius 2: full (Cratero)", + "tags":"full cratero aquarius" } ], [ { "id":24, - "action":"Aquarius 3 rising: Ptêbuou / Tepis", - "tags":"ptebuou tepis aquarius3" + "action":"Aquarius 3: full (Tepis)", + "tags":"full tepis aquarius" } ], [ { "id":25, - "action":"Pisces 1 rising: Biou / Acha", - "tags":"biou acha pisces1" + "action":"Pisces 1: full (Acha)", + "tags":"full acha pisces" } ], [ { "id":26, - "action":"Pisces 2 rising: Chontare / Tepibui", - "tags":"chontare tepibui pisces2" + "action":"Pisces 2: full (Tepibui)", + "tags":"full tepibui pisces" } ], [ { "id":27, - "action":"Pisces 3 rising: Ptibiou / Uiu", - "tags":"ptibiou uiu pisces3" + "action":"Pisces 3: full (Uiu)", + "tags":"full uiu pisces" + } + ], + [ + { + "id":37, + "action":"Aries: empty", + "tags":"empty aries" + } + ], + [ + { + "id":38, + "action":"Taurus: empty", + "tags":"empty taurus" + } + ], + [ + { + "id":39, + "action":"Gemini: empty", + "tags":"empty gemini" + } + ], + [ + { + "id":40, + "action":"Cancer: empty", + "tags":"empty cancer" + } + ], + [ + { + "id":41, + "action":"Leo: empty", + "tags":"empty leo" + } + ], + [ + { + "id":42, + "action":"Virgo: empty", + "tags":"empty virgo" + } + ], + [ + { + "id":43, + "action":"Libra: empty", + "tags":"empty libra" + } + ], + [ + { + "id":44, + "action":"Scorpio: empty", + "tags":"empty scorpio" + } + ], + [ + { + "id":45, + "action":"Sagittarius: empty", + "tags":"empty sagittarius" + } + ], + [ + { + "id":46, + "action":"Capricorn: empty", + "tags":"empty capricorn" + } + ], + [ + { + "id":47, + "action":"Aquarius: empty", + "tags":"empty aquarius" + } + ], + [ + { + "id":48, + "action":"Pisces: empty", + "tags":"empty pisces" } ] ] }, property: function(m) { - return SL.Astro.Logy.getZodiac(m.ephemeris.asc.deg).decan; + return m.ephemeris.sun.deg; }, calculate: function(definitions, property) { - return definitions.actions[property]; + return definitions.actions[getFullDegrees(property)]; } }; + +//Defines Calendar Objects and Methods +var module_decans_fulldegrees_rising = { + + definitions: { + name: "Full + Empty Rising", + description: "Full and empty rising degrees of the Decans, according to Firmicus Maternus 'Ancient Astrology', Book 4, XXII", + group: { + id: "decans", + text: "Decans", + info: "true" + }, + actions: module_decans_fulldegrees.definitions.actions + }, + property: function(m) { + return m.ephemeris.asc.deg; + }, + calculate: function(definitions, property) { + var a = definitions.actions[getFullDegrees(property)]; + a[0].action += " rising"; + return a; + } +}; + +function getFullDegrees(property) { + + // Aries + if ( property < 3 ) return 37; + if ( property >= 3 && property < 8 ) return 1; + if ( property >= 8 && property < 17 ) return 37; + if ( property >= 17 && property < 21 ) return 2; + if ( property >= 21 && property < 26 ) return 37; + if ( property >= 26 && property < 30 ) return 3; + + // Taurus + if ( property >= 30 && property < 33 ) return 38; + if ( property >= 33 && property < 40 ) return 4; + if ( property >= 40 && property < 42 ) return 38; + if ( property >= 42 && property < 50 ) return 5; + if ( property >= 50 && property < 55 ) return 38; + if ( property >= 55 && property < 60 ) return 6; + + // Gemini + if ( property >= 60 && property < 67 ) return 7; + if ( property >= 67 && property < 69 ) return 39; + if ( property >= 69 && property < 74 ) return 8; + if ( property >= 74 && property < 77 ) return 39; + if ( property >= 77 && property < 83 ) return 9; + if ( property >= 83 && property < 90 ) return 39; + + // Cancer + if ( property >= 90 && property < 97 ) return 40; + if ( property >= 97 && property < 103 ) return 10; + if ( property >= 103 && property < 105 ) return 40; + if ( property >= 105 && property < 109 ) return 11; + if ( property >= 109 && property < 111 ) return 40; + if ( property >= 111 && property < 120 ) return 12; + + // Leo + if ( property >= 120 && property < 127 ) return 13; + if ( property >= 127 && property < 131 ) return 41; + if ( property >= 131 && property < 134 ) return 14; + if ( property >= 134 && property < 140 ) return 41; + if ( property >= 140 && property < 150 ) return 15; + + // Virgo + if ( property >= 150 && property < 155 ) return 42; + if ( property >= 155 && property < 160 ) return 16; + if ( property >= 160 && property < 162 ) return 42; + if ( property >= 162 && property < 168 ) return 17; + if ( property >= 168 && property < 174 ) return 42; + if ( property >= 174 && property < 178 ) return 18; + if ( property >= 178 && property < 180 ) return 42; + + // Libra + if ( property >= 180 && property < 185 ) return 19; + if ( property >= 185 && property < 191 ) return 43; + if ( property >= 191 && property < 199 ) return 20; + if ( property >= 199 && property < 202 ) return 43; + if ( property >= 202 && property < 208 ) return 21; + if ( property >= 208 && property < 210 ) return 43; + + // Scorpio + if ( property >= 210 && property < 213 ) return 44; + if ( property >= 213 && property < 218 ) return 22; + if ( property >= 218 && property < 224 ) return 44; + if ( property >= 224 && property < 230 ) return 23; + if ( property >= 230 && property < 232 ) return 44; + if ( property >= 232 && property < 237 ) return 24; + if ( property >= 237 && property < 240 ) return 44; + + // Sagittarius + if ( property >= 240 && property < 249 ) return 25; + if ( property >= 249 && property < 252 ) return 45; + if ( property >= 252 && property < 259 ) return 26; + if ( property >= 259 && property < 263 ) return 45; + if ( property >= 263 && property < 270 ) return 27; + + // Capricorn + if ( property >= 270 && property < 277 ) return 46; + if ( property >= 277 && property < 280 ) return 28; + if ( property >= 280 && property < 285 ) return 46; + if ( property >= 285 && property < 289 ) return 29; + if ( property >= 289 && property < 294 ) return 46; + if ( property >= 294 && property < 300 ) return 30; + + // Aquarius + if ( property >= 300 && property < 304 ) return 47; + if ( property >= 304 && property < 309 ) return 31; + if ( property >= 309 && property < 313 ) return 47; + if ( property >= 313 && property < 319 ) return 32; + if ( property >= 319 && property < 322 ) return 47; + if ( property >= 322 && property < 330 ) return 33; + + // Pisces + if ( property >= 330 && property < 336 ) return 48; + if ( property >= 336 && property < 342 ) return 34; + if ( property >= 342 && property < 345 ) return 48; + if ( property >= 345 && property < 350 ) return 35; + if ( property >= 350 && property < 356 ) return 48; + if ( property >= 356 && property < 358 ) return 36; + if ( property >= 358 && property < 360 ) return 48; + +} diff --git a/js/modules/pgm.js b/js/modules/pgm.js index d409c58..2257db6 100644 --- a/js/modules/pgm.js +++ b/js/modules/pgm.js @@ -198,6 +198,7 @@ var module_pgm_civildate = { definitions: { name: "Egyptian Civil Date + Unlucky Days", + description: "Calculation of the date according to the old 365 days Egyptian Civil Calendar. It was reformed to a 365.25 day calendar by Ptolemy III. and banned by Augustus but continuously used in secret by mages and astrologers until the 6th century. The unlucky days of PGM VII.272ff. are applied to this date.", group: { id: "pgm", text: "PGM",