diff --git a/data/experience.json b/data/experience.json index 7c9abf0..b983ec2 100644 --- a/data/experience.json +++ b/data/experience.json @@ -104,7 +104,7 @@ }, { "name": "Qatar NJM system", - "website": "", + "website": "https://portal.moi.gov.qa/wps/portal/MOIInternet/departmentcommittees/ncc/", "description": "Team member in a system for Qatar’s Ministry of Interior, comprises integrated software and hardware infrastructure which utilizes the latest geospatial technologies in resources tracking, emergency call taking, and dispatching police units to crime scenes instantly. Developed various modules in CallTaking module and Mapviewer module, and fixed bugs throughout all modules of the project", "location": { "place":"Esri Northeast Africa", @@ -117,7 +117,7 @@ }, { "name": "Electronic City Planning(ECP) for Jeddah Municipality", - "website": "", + "website": "http://www.jeddah.gov.sa/English/index.php", "description": "Key member in design and implantation phases in the project, ECP is a cadastral GIS system involved in the operations of land services and integrates with several systems in the municipality, was based in the site in KSA so as to handle the deployment, integration with external systems, also to conduct the operation support", "location": { "place":"Jeddah Municipality", diff --git a/img/esri.gif b/img/esri.gif deleted file mode 100644 index df8e496..0000000 Binary files a/img/esri.gif and /dev/null differ diff --git a/index.html b/index.html index ffb18c9..13d5b45 100644 --- a/index.html +++ b/index.html @@ -162,7 +162,7 @@

Experience

Senior Software Developer / Software Team Lead

-
Khatib & Alami - Beirut, Lebanon
+
Khatib & Alami - Beirut, Lebanon

Designing and developing software products/services, leading development teams, onsite/remote deployment, fixing deployment bugs, troubleshooting performance issues, and conducting user trainings and UATs. Always aligning with CMMI standards. Stressful environment, and tight deadlines are always a challenge.

@@ -272,7 +272,8 @@

Skills

leaflet
- ESRI + + ESRI
QGIS @@ -425,13 +426,11 @@

Certifications

- diff --git a/js/resume.js b/js/resume.js deleted file mode 100644 index b447927..0000000 --- a/js/resume.js +++ /dev/null @@ -1,30 +0,0 @@ -(function($) { - "use strict"; // Start of use strict - $(document).ready(function(){ - - }); - // Smooth scrolling using jQuery easing - $('a.js-scroll-trigger[href*="#"]:not([href="#"])').click(function() { - if (location.pathname.replace(/^\//, '') == this.pathname.replace(/^\//, '') && location.hostname == this.hostname) { - var target = $(this.hash); - target = target.length ? target : $('[name=' + this.hash.slice(1) + ']'); - if (target.length) { - $('html, body').animate({ - scrollTop: (target.offset().top) - }, 1000, "easeInOutExpo"); - return false; - } - } - }); - - // Closes responsive menu when a scroll trigger link is clicked - $('.js-scroll-trigger').click(function() { - $('.navbar-collapse').collapse('hide'); - }); - - // Activate scrollspy to add active class to navbar items on scroll - $('body').scrollspy({ - target: '#sideNav' - }); - -})(jQuery); // End of use strict diff --git a/js/resume.min.js b/js/resume.min.js deleted file mode 100644 index 23ced8e..0000000 --- a/js/resume.min.js +++ /dev/null @@ -1 +0,0 @@ -!function(e){"use strict";e('a.js-scroll-trigger[href*="#"]:not([href="#"])').click(function(){if(location.pathname.replace(/^\//,"")==this.pathname.replace(/^\//,"")&&location.hostname==this.hostname){var t=e(this.hash);if((t=t.length?t:e("[name="+this.hash.slice(1)+"]")).length)return e("html, body").animate({scrollTop:t.offset().top},1e3,"easeInOutExpo"),!1}}),e(".js-scroll-trigger").click(function(){e(".navbar-collapse").collapse("hide")}),e("body").scrollspy({target:"#sideNav"})}(jQuery); \ No newline at end of file diff --git a/js/resumeapp.js b/js/resumeapp.js index ad53595..77ffdfc 100644 --- a/js/resumeapp.js +++ b/js/resumeapp.js @@ -62,6 +62,28 @@ resumeApp.controller('ResumeController', function ResumeController($scope) { $scope.fiterTime = "all" $scope.inializeMap(); $scope.loadDependencies(); + $('a.js-scroll-trigger[href*="#"]:not([href="#"])').click(function() { + if (location.pathname.replace(/^\//, '') == this.pathname.replace(/^\//, '') && location.hostname == this.hostname) { + var target = $(this.hash); + target = target.length ? target : $('[name=' + this.hash.slice(1) + ']'); + if (target.length) { + $('html, body').animate({ + scrollTop: (target.offset().top) + }, 1000, "easeInOutExpo"); + return false; + } + } + }); + + // Closes responsive menu when a scroll trigger link is clicked + $('.js-scroll-trigger').click(function() { + $('.navbar-collapse').collapse('hide'); + }); + + // Activate scrollspy to add active class to navbar items on scroll + $('body').scrollspy({ + target: '#sideNav' + }); } $scope.selectAllClicked = function(){ $scope.filterExperiences = "all"; @@ -109,12 +131,7 @@ resumeApp.controller('ResumeController', function ResumeController($scope) { } var icon = L.icon({ iconUrl: iconUrl, - iconSize: [32, 32], // size of the icon - // shadowSize: [50, 64], // size of the shadow - // iconAnchor: [22, 94], // point of the icon which will correspond to marker's location - // shadowAnchor: [4, 62], // the same for the shadow - // popupAnchor: [-3, -76] // point from which the popup should open relative to the iconAnchor }); return icon; } @@ -122,7 +139,7 @@ resumeApp.controller('ResumeController', function ResumeController($scope) { icontype = exp ? exp.experienceType : "project"; // $scope.markersLayer.addLayer(marker) markerIcon = $scope.getMarkerIcon(icontype) - var marker = L.marker([location.lat, location.long],{icon: markerIcon})//.addTo($scope.map); + var marker = L.marker([location.lat, location.long],{icon: markerIcon}) var title = ""; if(proj) title = "PROJECT"; else if (exp) @@ -159,13 +176,11 @@ resumeApp.controller('ResumeController', function ResumeController($scope) { marker.bindPopup(popuphtml) $scope.markersLayer.addLayer(marker) var country = $scope.getCountryPolygon(location.country) - console.log(country) if(country) { country.exp = exp country.proj = proj $scope.geojsonlayer.addData(country); - //console.log(country) } } $scope.showExperiences = function(){