Moved Planned Activity 1 to Planning Core for PEG meeting

@@ -21,7 +21,7 @@ UC2:ActivityDependency_1
       rdfs:label "Activity dependency 1"^^xsd:string .
 
 UC2:ActivityWBS_1
-      rdf:type COR:ADA , ILAP:ActivityWBS , PBS:AC , <http://www.ilap.no/codes/NORSOK/Z-014/SABCoding#6> ;
+      rdf:type <http://www.ilap.no/codes/NORSOK/Z-014/SABCoding#6> , PBS:AC , ILAP:ActivityWBS , COR:ADA ;
       rdfs:label "Activity WBS 1"^^xsd:string .
 
 UC2:Baseline_1
@@ -37,14 +37,12 @@ UC2:CurrentControlEstimate_1
       rdfs:label "Current control estimate 1"^^xsd:string .
 
 UC2:Discipline_1
-      rdf:type COR:BEA , ILAP:Discipline ;
+      rdf:type ILAP:Discipline , COR:BEA ;
       rdfs:label "Discipline 1"^^xsd:string .
 
 UC2:FinishToStart_1
       rdf:type ILAP:FinishToStart ;
       rdfs:label "Finish to start 1"^^xsd:string ;
-      ILAP:hasPredecessorActivity
-              UC2:PlannedActivity_1 ;
       ILAP:hasSuccessorActivity
               UC2:PlannedActivity_2 ;
       ILAP:hasSuccessorCalendar
@@ -53,7 +51,7 @@ UC2:FinishToStart_1
               2 .
 
 UC2:Location_1
-      rdf:type NPD:StatfjordA , ILAP:Location ;
+      rdf:type ILAP:Location , NPD:StatfjordA ;
       rdfs:label "Location 1"^^xsd:string .
 
 UC2:Milestone_1
@@ -64,49 +62,6 @@ UC2:NetworkSchedule_1
       rdf:type ILAP:NetworkSchedule ;
       rdfs:label "Network schedule 1"^^xsd:string .
 
-UC2:PlannedActivity_1
-      rdf:type ILAP:PlannedActivity ;
-      rdfs:label "Planned activity 1"^^xsd:string ;
-      ILAP:hasActivityActualProgressPercent
-              "50"^^xsd:float ;
-      ILAP:hasActivityCalendar
-              UC2:Regular8To16WorkingDayCalendar_1 ;
-      ILAP:hasActivityContractor
-              <http://data.posccaesar.org/brreg/Subsea7> ;
-      ILAP:hasActivityDiscipline
-              UC2:Discipline_1 ;
-      ILAP:hasActivityEstimatedWeight
-              "15000"^^xsd:float ;
-      ILAP:hasActivityLocation
-              NPD:StafjordA , UC2:Location_1 ;
-      ILAP:hasActivityPartActivity
-              UC2:PlannedActivity_2 ;
-      ILAP:hasActivityPhase
-              NCS:Operation ;
-      ILAP:hasActivityPhysicalPercentComplete
-              "45"^^xsd:float ;
-      ILAP:hasActivityPlannedProgressPercent
-              55 ;
-      ILAP:hasActivityRegulator
-              <http://data.posccaesar.org/brreg/NPD> ;
-      ILAP:hasActivityResponsibleOrganization
-              UC2:ResponsibleOrganization_1 ;
-      ILAP:hasActivityResponsiblePerson
-              UC2:ResponsiblePerson_1 ;
-      ILAP:hasActivityServiceSupplier
-              <http://data.posccaesar.org/brreg/Schlumberger> ;
-      ILAP:hasActivityStatus
-              NCS:Active ;
-      ILAP:hasActivitySuccessor
-              UC2:FinishToStart_1 ;
-      ILAP:hasActivityTaskLeader
-              UC2:ResponsiblePerson_1 ;
-      ILAP:hasActivityVendor
-              <http://data.posccaesar.org/brreg/BakerHughes> ;
-      ILAP:hasActivityWBS UC2:ActivityWBS_1 ;
-      ILAP:hasActivityWorkVolume
-              "550"^^xsd:float .
-
 UC2:PlannedActivity_2
       rdf:type ILAP:PlannedActivity ;
       rdfs:label "Planned activity 2"^^xsd:string .
@@ -131,7 +86,7 @@ UC2:Profile_1
       rdf:type ILAP:Profile ;
       rdfs:label "Profile 1"^^xsd:string ;
       ILAP:hasProfilePoint
-              UC2:ProfilePoint_2 , UC2:ProfilePoint_1 .
+              UC2:ProfilePoint_1 , UC2:ProfilePoint_2 .
 
 UC2:ProjectPlan_2
       rdf:type ILAP:ProjectPlan ;
@@ -172,18 +127,18 @@ ILAP:ContractorWBS_1
       rdf:type ILAP:ContractorWBS ;
       rdfs:label "Contractor WBS 1"^^xsd:string ;
       ILAP:hasContractorWBSelement
-              "Installation activity"^^xsd:string , "Installing pump"^^xsd:string , "Pump engineer"^^xsd:string .
+              "Pump engineer"^^xsd:string , "Installing pump"^^xsd:string , "Installation activity"^^xsd:string .
 
 ILAP:PlannedActivity
       rdfs:subClassOf
               [ rdf:type owl:Restriction ;
-                owl:allValuesFrom ILAP:Calendar ;
-                owl:onProperty ILAP:hasActivityCalendar
+                owl:allValuesFrom ILAP:ResponsibleOrganization ;
+                owl:onProperty ILAP:hasActivityResponsibleOrganization
               ] ;
       rdfs:subClassOf
               [ rdf:type owl:Restriction ;
-                owl:allValuesFrom ILAP:ResponsibleOrganization ;
-                owl:onProperty ILAP:hasActivityResponsibleOrganization
+                owl:allValuesFrom ILAP:Calendar ;
+                owl:onProperty ILAP:hasActivityCalendar
               ] .
 
 ILAP:TargetSchedule_1