Skip to content

Commit 9641e10

Browse files
committed
add esri cert logo, merge script files into one and update project URLs
1 parent 7607c1a commit 9641e10

6 files changed

Lines changed: 28 additions & 45 deletions

File tree

data/experience.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@
104104
},
105105
{
106106
"name": "Qatar NJM system",
107-
"website": "",
107+
"website": "https://portal.moi.gov.qa/wps/portal/MOIInternet/departmentcommittees/ncc/",
108108
"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",
109109
"location": {
110110
"place":"Esri Northeast Africa",
@@ -117,7 +117,7 @@
117117
},
118118
{
119119
"name": "Electronic City Planning(ECP) for Jeddah Municipality",
120-
"website": "",
120+
"website": "http://www.jeddah.gov.sa/English/index.php",
121121
"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",
122122
"location": {
123123
"place":"Jeddah Municipality",

img/esri.gif

-16.5 KB
Binary file not shown.

index.html

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ <h2 class="mb-5">Experience</h2>
162162
<div class="resume-item d-flex flex-column flex-md-row mb-5">
163163
<div class="resume-content mr-auto">
164164
<h3 class="mb-0">Senior Software Developer / Software Team Lead</h3>
165-
<div class="subheading mb-3"><a href = "" target = "_blank">Khatib & Alami<a/> - Beirut, Lebanon</div>
165+
<div class="subheading mb-3"><a href = "http://khatibalami.com/Portfolio/GSI.html" target = "_blank">Khatib & Alami<a/> - Beirut, Lebanon</div>
166166
<p>Designing and developing software products/services, leading development teams, onsite/remote deployment,
167167
fixing deployment bugs, troubleshooting performance issues, and conducting user trainings and UATs.
168168
Always aligning with CMMI standards. Stressful environment, and tight deadlines are always a challenge.</p>
@@ -272,7 +272,8 @@ <h2 class="mb-5">Skills</h2>
272272
<img style="max-width:100%" src="https://raw.githubusercontent.com/Leaflet/Leaflet/master/docs/docs/images/logo.png" alt="leaflet">
273273
</div>
274274
<div class="col mx-2" style="text-align:center;align-items: center;" >
275-
<img style="max-width:100%" src="img/esriCert.png" alt="ESRI">
275+
<a href = "https://www.certmetrics.com/esri/public/transcript.aspx?transcript=9T02QGW22N1E5W4B" target = "_blank">
276+
<img style="max-width:100%" src="img/esriCert.png" alt="ESRI"> </a>
276277
</div>
277278
<div class="col mx-2 align-middle" style="display: flex;align-items: center;">
278279
<img style="max-width:100%" src="img/qgis-logo.png" alt="QGIS">
@@ -425,13 +426,11 @@ <h2 class="mb-5">Certifications</h2>
425426

426427
<script src="node_modules/jquery/dist/jquery.min.js"></script>
427428
<script src="node_modules/jquery-ui-dist/jquery-ui.min.js">
428-
429429
</script>
430430
<script src="node_modules/bootstrap/dist/js/bootstrap.bundle.js"></script>
431431
<script src="node_modules/angular/angular.min.js"></script>
432432
<script src="node_modules/leaflet/dist/leaflet.js"></script>
433433
<script src="node_modules/leaflet.markercluster/dist/leaflet.markercluster.js"></script>
434-
<script src="js/resume.js"></script>
435434
<script src="js/resumeapp.js"></script>
436435

437436
</body>

js/resume.js

Lines changed: 0 additions & 30 deletions
This file was deleted.

js/resume.min.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

js/resumeapp.js

Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,28 @@ resumeApp.controller('ResumeController', function ResumeController($scope) {
6262
$scope.fiterTime = "all"
6363
$scope.inializeMap();
6464
$scope.loadDependencies();
65+
$('a.js-scroll-trigger[href*="#"]:not([href="#"])').click(function() {
66+
if (location.pathname.replace(/^\//, '') == this.pathname.replace(/^\//, '') && location.hostname == this.hostname) {
67+
var target = $(this.hash);
68+
target = target.length ? target : $('[name=' + this.hash.slice(1) + ']');
69+
if (target.length) {
70+
$('html, body').animate({
71+
scrollTop: (target.offset().top)
72+
}, 1000, "easeInOutExpo");
73+
return false;
74+
}
75+
}
76+
});
77+
78+
// Closes responsive menu when a scroll trigger link is clicked
79+
$('.js-scroll-trigger').click(function() {
80+
$('.navbar-collapse').collapse('hide');
81+
});
82+
83+
// Activate scrollspy to add active class to navbar items on scroll
84+
$('body').scrollspy({
85+
target: '#sideNav'
86+
});
6587
}
6688
$scope.selectAllClicked = function(){
6789
$scope.filterExperiences = "all";
@@ -109,20 +131,15 @@ resumeApp.controller('ResumeController', function ResumeController($scope) {
109131
}
110132
var icon = L.icon({
111133
iconUrl: iconUrl,
112-
113134
iconSize: [32, 32], // size of the icon
114-
// shadowSize: [50, 64], // size of the shadow
115-
// iconAnchor: [22, 94], // point of the icon which will correspond to marker's location
116-
// shadowAnchor: [4, 62], // the same for the shadow
117-
// popupAnchor: [-3, -76] // point from which the popup should open relative to the iconAnchor
118135
});
119136
return icon;
120137
}
121138
$scope.addLocationToMap = function(location, exp, proj){
122139
icontype = exp ? exp.experienceType : "project";
123140
// $scope.markersLayer.addLayer(marker)
124141
markerIcon = $scope.getMarkerIcon(icontype)
125-
var marker = L.marker([location.lat, location.long],{icon: markerIcon})//.addTo($scope.map);
142+
var marker = L.marker([location.lat, location.long],{icon: markerIcon})
126143
var title = "";
127144
if(proj) title = "PROJECT";
128145
else if (exp)
@@ -159,13 +176,11 @@ resumeApp.controller('ResumeController', function ResumeController($scope) {
159176
marker.bindPopup(popuphtml)
160177
$scope.markersLayer.addLayer(marker)
161178
var country = $scope.getCountryPolygon(location.country)
162-
console.log(country)
163179
if(country)
164180
{
165181
country.exp = exp
166182
country.proj = proj
167183
$scope.geojsonlayer.addData(country);
168-
//console.log(country)
169184
}
170185
}
171186
$scope.showExperiences = function(){

0 commit comments

Comments
 (0)