Skip to content

Commit

Permalink
add esri cert logo, merge script files into one and update project URLs
Browse files Browse the repository at this point in the history
  • Loading branch information
alaacs committed Sep 6, 2018
1 parent 7607c1a commit 9641e10
Show file tree
Hide file tree
Showing 6 changed files with 28 additions and 45 deletions.
4 changes: 2 additions & 2 deletions data/experience.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down
Binary file removed img/esri.gif
Binary file not shown.
7 changes: 3 additions & 4 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ <h2 class="mb-5">Experience</h2>
<div class="resume-item d-flex flex-column flex-md-row mb-5">
<div class="resume-content mr-auto">
<h3 class="mb-0">Senior Software Developer / Software Team Lead</h3>
<div class="subheading mb-3"><a href = "" target = "_blank">Khatib & Alami<a/> - Beirut, Lebanon</div>
<div class="subheading mb-3"><a href = "http://khatibalami.com/Portfolio/GSI.html" target = "_blank">Khatib & Alami<a/> - Beirut, Lebanon</div>
<p>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.</p>
Expand Down Expand Up @@ -272,7 +272,8 @@ <h2 class="mb-5">Skills</h2>
<img style="max-width:100%" src="https://raw.githubusercontent.com/Leaflet/Leaflet/master/docs/docs/images/logo.png" alt="leaflet">
</div>
<div class="col mx-2" style="text-align:center;align-items: center;" >
<img style="max-width:100%" src="img/esriCert.png" alt="ESRI">
<a href = "https://www.certmetrics.com/esri/public/transcript.aspx?transcript=9T02QGW22N1E5W4B" target = "_blank">
<img style="max-width:100%" src="img/esriCert.png" alt="ESRI"> </a>
</div>
<div class="col mx-2 align-middle" style="display: flex;align-items: center;">
<img style="max-width:100%" src="img/qgis-logo.png" alt="QGIS">
Expand Down Expand Up @@ -425,13 +426,11 @@ <h2 class="mb-5">Certifications</h2>

<script src="node_modules/jquery/dist/jquery.min.js"></script>
<script src="node_modules/jquery-ui-dist/jquery-ui.min.js">

</script>
<script src="node_modules/bootstrap/dist/js/bootstrap.bundle.js"></script>
<script src="node_modules/angular/angular.min.js"></script>
<script src="node_modules/leaflet/dist/leaflet.js"></script>
<script src="node_modules/leaflet.markercluster/dist/leaflet.markercluster.js"></script>
<script src="js/resume.js"></script>
<script src="js/resumeapp.js"></script>

</body>
Expand Down
30 changes: 0 additions & 30 deletions js/resume.js

This file was deleted.

1 change: 0 additions & 1 deletion js/resume.min.js

This file was deleted.

31 changes: 23 additions & 8 deletions js/resumeapp.js
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -109,20 +131,15 @@ 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;
}
$scope.addLocationToMap = function(location, exp, proj){
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)
Expand Down Expand Up @@ -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(){
Expand Down

0 comments on commit 9641e10

Please sign in to comment.