Skip to content

Commit

Permalink
whatevs
Browse files Browse the repository at this point in the history
  • Loading branch information
fantasticlife committed Mar 12, 2021
2 parents 06a8525 + f97477a commit 9caeb4a
Show file tree
Hide file tree
Showing 26 changed files with 8 additions and 9 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# Ignore Mac DS_Store files
.DS_Store
.backup
.idea/
Binary file modified meta/relational/schema.graffle
Binary file not shown.
Binary file modified meta/relational/schema.pdf
Binary file not shown.
Binary file modified meta/relational/schema.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 7 additions & 7 deletions meta/weeknotes/feed.rss
Original file line number Diff line number Diff line change
Expand Up @@ -12,43 +12,43 @@
<description>Procedure modelling notes for 2021 week 9.</description>
<link>https://ukparliament.github.io/ontologies/meta/weeknotes/2021/09</link>
<pubDate>Sun, 7 March 2021 13:30:00 GMT</pubDate>
<item>
</item>
<item>
<title>2021 week 8</title>
<description>Procedure modelling notes for 2021 week 8.</description>
<link>https://ukparliament.github.io/ontologies/meta/weeknotes/2021/08</link>
<pubDate>Sun, 28 February 2021 13:30:00 GMT</pubDate>
<item>
</item>
<item>
<title>2021 week 7</title>
<description>Procedure modelling notes for 2021 week 7.</description>
<link>https://ukparliament.github.io/ontologies/meta/weeknotes/2021/07</link>
<pubDate>Sun, 21 February 2021 14:45:00 GMT</pubDate>
<item>
</item>
<item>
<title>2021 week 6</title>
<description>Procedure modelling notes for 2021 week 6.</description>
<link>https://ukparliament.github.io/ontologies/meta/weeknotes/2021/06</link>
<pubDate>Sun, 14 February 2021 13:45:00 GMT</pubDate>
<item>
</item>
<item>
<title>2021 week 5</title>
<description>Procedure modelling notes for 2021 week 5.</description>
<link>https://ukparliament.github.io/ontologies/meta/weeknotes/2021/05</link>
<pubDate>Sun, 7 February 2021 16:45:00 GMT</pubDate>
<item>
</item>
<item>
<title>2021 week 4</title>
<description>Procedure modelling notes for 2021 week 4.</description>
<link>https://ukparliament.github.io/ontologies/meta/weeknotes/2021/04</link>
<pubDate>Sun, 31 January 2021 14:30:00 GMT</pubDate>
<item>
</item>
<item>
<title>2021 week 3</title>
<description>Procedure modelling notes for 2021 week 3.</description>
<link>https://ukparliament.github.io/ontologies/meta/weeknotes/2021/03</link>
<pubDate>Mon, 25 January 2021 20:00:00 GMT</pubDate>
<item>
</sitem>
<item>
<title>2021 week 2</title>
<description>Procedure modelling notes for 2021 week 2.</description>
Expand Down
Binary file modified procedure/flowcharts/crag-treaties/crag-treaties.graffle
Binary file not shown.
Binary file modified procedure/flowcharts/crag-treaties/crag-treaties.pdf
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified procedure/flowcharts/sis/draft-affirmative.graffle
Binary file not shown.
Binary file modified procedure/flowcharts/sis/draft-affirmative.pdf
Binary file not shown.
Binary file modified procedure/flowcharts/sis/draft-composite.graffle
Binary file not shown.
Binary file modified procedure/flowcharts/sis/draft-composite.pdf
Binary file not shown.
Binary file modified procedure/flowcharts/sis/draft-negative.graffle
Binary file not shown.
Binary file modified procedure/flowcharts/sis/draft-negative.pdf
Binary file not shown.
Binary file modified procedure/flowcharts/sis/made-affirmative.graffle
Binary file not shown.
Binary file modified procedure/flowcharts/sis/made-affirmative.pdf
Binary file not shown.
Binary file modified procedure/flowcharts/sis/made-negative.graffle
Binary file not shown.
Binary file modified procedure/flowcharts/sis/made-negative.pdf
Binary file not shown.
Binary file added procedure/flowcharts/treaties/treaties.graffle
Binary file not shown.
Binary file added procedure/flowcharts/treaties/treaties.pdf
Binary file not shown.
1 change: 0 additions & 1 deletion procedure/meta/backlog/index.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# Data model backlog


Work | Description | Deadline | Done?
Enabling Act | Point to enabling Act. Needed for new PNSIs ||
Logicification | Switch from route types to logic steps | N/A |
Expand Down
Binary file modified procedure/meta/editor/schema.graffle
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ The [Non-contentious Probate (Fees) Order 2018](https://statutoryinstruments.par

* [2019](https://api.parliament.uk/sparql#query=%23+This+query+uses+classes+from+UK+Parliament's+procedure+ontology%3A+https%3A%2F%2Fukparliament.github.io%2Fontologies%2Fprocedure%2Fprocedure-ontology.html.%0A%0A%23+This+query+looks+for+all+statutory+instruments+laid+in+the+2019+calendar+year.+They+were+all+laid+under+one+of+the+four+main+SI+procedures+(Made+affirmative%2C+Draft+affirmative%2C+Made+negative%2C+Draft+negative)%0A%0APREFIX+rdfs%3A+%3Chttp%3A%2F%2Fwww.w3.org%2F2000%2F01%2Frdf-schema%23%3E%0APREFIX+%3A+%3Chttps%3A%2F%2Fid.parliament.uk%2Fschema%2F%3E%0APREFIX+id%3A+%3Chttps%3A%2F%2Fid.parliament.uk%2F%3E%0A%23+The+above+rows+describe+where+the+datasets+that+this+query+is+built+on+come+from.%0A%0Aselect+%3Fproc+%3FSI+%3FSIname+%3FStatutoryInstrumentYear+%3FlayingBodyName+%3FMadedate+%3FComesintoforceDate+%3FComesintoforceNote+%3FLink+%3FworkPackage+%3FprocStepName+%3Fdate+where+%7B%0A++++++%23+The+select+row+is+identifying+what+information+to+return+from+the+query.+These+are+all+variables+from+the+query+below.+%0A++%0A++%23+SPARQL+variables+start+with+a+%3F+and+can+match+any+node+(resource+or+literal)+in+the+RDF+dataset.++%0A%0A+%3FSI+a+%3AStatutoryInstrumentPaper+.++%0A+%23+An+SI+is+considered+a+workpackageable+thing+which+is+the+focus+of+a+workpackage.+%0A+%0A+++++%3FSI+rdfs%3Alabel+%3FSIname+%3B%0A++%3AstatutoryInstrumentPaperYear+%3FStatutoryInstrumentYear+.%0A+++%23+Year+is+an+important+part+of+a+statutory+instrument's+reference+as+they+are+numbered+sequentially+by+year.+At+the+beginning+of+the+year+the+count+starts+again.+%0A+%0A++%23++It+is+useful+to+be+able+to+have+queries+that+allow+information+to+be+added+to+the+solution+where+the+information+is+available%2C+but+do+not+reject+the+solution+because+some+part+of+the+query+pattern+does+not+match.+The+use+of+OPTIONAL+below+allows+this%2C+if+the+data+does+not+exist+then+it+will+still+include+the+SI+in+the+results.+The+reason+we+include+the+optional+for+the+variables+below+is+because+SIs+do+not+follow+a+strict+pattern+of+what+data+it+has.+Likewise%2C+there+can+also+be+a+delay+in+an+SI+being+published+on+Legislation.gov+so+we+also+say+links+are+optional+so+that+any+possible+instrument+appears+in+the+results+still.+%0A%0A++OPTIONAL+%7B+%3FSI+%3AworkPackagedThingHasWorkPackagedThingWebLink+%3FLink+.%7D%0A+++OPTIONAL+%7B+%3FSI+%3AstatutoryInstrumentPaperMadeDate+%3FMadedate+.%7D%0A++OPTIONAL+%7B+%3FSI+%3AstatutoryInstrumentPaperComingIntoForceDate+%3FComesintoforceDate+.+%7D%0A++OPTIONAL+%7B+%3FSI+%3AstatutoryInstrumentPaperComingIntoForceNote+%3FComesintoforceNote.+%7D%0A++%0A+++%09%3FSI+%3AworkPackagedThingHasWorkPackage+%3FworkPackage+.%0A++++%23+A+workpackage+is+a+group+of+business+items+under+a+procedure+or+as+determined+by+a+committee%2C+for+example%3A+business+items+considered+during+the+passage+of+a+particular+Statutory+Instrument.%0A%0A++%09%3FworkPackage+%3AworkPackageHasProcedure%2Frdfs%3Alabel+%3Fproc%0A+FILTER(%3Fproc+IN+(%22Draft+affirmative%22%2C+%22Draft+negative%22%2C+%22Made+affirmative%22%2C+%22Made+negative%22))%0A++++%23+Statutory+instruments+can+be+laid+under+a+number+of+procedures+with+all+having+different+routes+through+Parliament.+The+procedures+above+are+the+four+main+procedures+mapped+out+for+the+Statutory+Instrument+Service.++%0A%0A++%3FworkPackage+%3AworkPackageHasBusinessItem+%3FprocStep+.%0A++++++%23+A+business+item+is+an+item+of+business+conducted+either+within+or+outside+Parliament.+For+example%3A+the+tabling+of+an+early+day+motion%2C+a+laying+of+a+paper%2C+the+making+of+a+statutory+instrument+by+a+government+minister.%0A%0A+++++%3FprocStep+%3AbusinessItemDate+%3Fdate+.%0A+++++%23+The+majority+of+business+items+will+also+have+a+date+of+when+the+business+took+place.+For+the+purpose+of+this+query+the+date+will+be+the+date+the+instrument+was+laid+before+the+House+of+Commons.%0A%0A++%3FprocStep+%3AbusinessItemHasProcedureStep+id%3Acspzmb6w+.%0A++++%23+All+business+items+will+have+one+or+more+procedure+steps+attached.+All+procedure+steps+will+have+a+name+and+ID%2C+we+use+the+ID+to+search+for+the+step+as+it+is+constant+whereas+the+name+could+change.+The+ID+cspzmb6w+is+for+the+%22Laid+before+the+House+of+Commons+step%22.+%0A%0A++%3FprocStep+%3AbusinessItemHasProcedureStep%2Frdfs%3Alabel+%3FprocStepName.+++%0A+++++++%23+As+above+procedure+steps+will+always+have+a+name%2C+we+include+it+in+the+query+because+it's+more+accessible+for+users+than+the+procedure+ID.+%0A%0A++%3FprocStep+%3AlayingHasLayingBody%2F%3Aname+%3FlayingBodyName+.%0A%0A+FILTER+(+str(%3Fdate)+%3E+'2019-01-01'+%26%26+str(%3Fdate)+%3C+'2020-01-01')%0A+++%23++This+filter+limits+the+date+the+results+will+look+for.+%0A%0A%7D&contentTypeConstruct=text%2Fturtle&contentTypeSelect=application%2Fsparql-results%2Bjson&endpoint=https%3A%2F%2Fapi.parliament.uk%2Fsparql&requestMethod=POST&tabTitle=2019+calendar+year&headers=%7B%7D&outputFormat=table)


* [2018](https://api.parliament.uk/sparql#query=%23+This+query+uses+classes+from+UK+Parliament's+procedure+ontology%3A+https%3A%2F%2Fukparliament.github.io%2Fontologies%2Fprocedure%2Fprocedure-ontology.html.%0A%0A%23+This+query+looks+for+all+statutory+instruments+laid+in+the+2018+calendar+year.+They+were+all+laid+under+one+of+the+four+main+SI+procedures+(Made+affirmative%2C+Draft+affirmative%2C+Made+negative%2C+Draft+negative)%0A%0APREFIX+rdfs%3A+%3Chttp%3A%2F%2Fwww.w3.org%2F2000%2F01%2Frdf-schema%23%3E%0APREFIX+%3A+%3Chttps%3A%2F%2Fid.parliament.uk%2Fschema%2F%3E%0APREFIX+id%3A+%3Chttps%3A%2F%2Fid.parliament.uk%2F%3E%0A%23+The+above+rows+describe+where+the+datasets+that+this+query+is+built+on+come+from.%0A%0Aselect+%3Fproc+%3FSI+%3FSIname+%3FStatutoryInstrumentYear+%3FlayingBodyName+%3FMadedate+%3FComesintoforceDate+%3FComesintoforceNote+%3FLink+%3FworkPackage+%3FprocStepName+%3Fdate+where+%7B%0A++++++%23+The+select+row+is+identifying+what+information+to+return+from+the+query.+These+are+all+variables+from+the+query+below.+%0A++%0A++%23+SPARQL+variables+start+with+a+%3F+and+can+match+any+node+(resource+or+literal)+in+the+RDF+dataset.++%0A%0A+%3FSI+a+%3AStatutoryInstrumentPaper+.++%0A+%23+An+SI+is+considered+a+workpackageable+thing+which+is+the+focus+of+a+workpackage.+%0A+%0A+++++%3FSI+rdfs%3Alabel+%3FSIname+%3B%0A++%3AstatutoryInstrumentPaperYear+%3FStatutoryInstrumentYear+.%0A+++%23+Year+is+an+important+part+of+a+statutory+instrument's+reference+as+they+are+numbered+sequentially+by+year.+At+the+beginning+of+the+year+the+count+starts+again.+%0A+%0A++%23++It+is+useful+to+be+able+to+have+queries+that+allow+information+to+be+added+to+the+solution+where+the+information+is+available%2C+but+do+not+reject+the+solution+because+some+part+of+the+query+pattern+does+not+match.+The+use+of+OPTIONAL+below+allows+this%2C+if+the+data+does+not+exist+then+it+will+still+include+the+SI+in+the+results.+The+reason+we+include+the+optional+for+the+variables+below+is+because+SIs+do+not+follow+a+strict+pattern+of+what+data+it+has.+Likewise%2C+there+can+also+be+a+delay+in+an+SI+being+published+on+Legislation.gov+so+we+also+say+links+are+optional+so+that+any+possible+instrument+appears+in+the+results+still.+%0A%0A++OPTIONAL+%7B+%3FSI+%3AworkPackagedThingHasWorkPackagedThingWebLink+%3FLink+.%7D%0A+++OPTIONAL+%7B+%3FSI+%3AstatutoryInstrumentPaperMadeDate+%3FMadedate+.%7D%0A++OPTIONAL+%7B+%3FSI+%3AstatutoryInstrumentPaperComingIntoForceDate+%3FComesintoforceDate+.+%7D%0A++OPTIONAL+%7B+%3FSI+%3AstatutoryInstrumentPaperComingIntoForceNote+%3FComesintoforceNote.+%7D%0A++%0A+++%09%3FSI+%3AworkPackagedThingHasWorkPackage+%3FworkPackage+.%0A++++%23+A+workpackage+is+a+group+of+business+items+under+a+procedure+or+as+determined+by+a+committee%2C+for+example%3A+business+items+considered+during+the+passage+of+a+particular+Statutory+Instrument.%0A%0A++%09%3FworkPackage+%3AworkPackageHasProcedure%2Frdfs%3Alabel+%3Fproc%0A+FILTER(%3Fproc+IN+(%22Draft+affirmative%22%2C+%22Draft+negative%22%2C+%22Made+affirmative%22%2C+%22Made+negative%22))%0A++++%23+Statutory+instruments+can+be+laid+under+a+number+of+procedures+with+all+having+different+routes+through+Parliament.+The+procedures+above+are+the+four+main+procedures+mapped+out+for+the+Statutory+Instrument+Service.++%0A%0A++%3FworkPackage+%3AworkPackageHasBusinessItem+%3FprocStep+.%0A++++++%23+A+business+item+is+an+item+of+business+conducted+either+within+or+outside+Parliament.+For+example%3A+the+tabling+of+an+early+day+motion%2C+a+laying+of+a+paper%2C+the+making+of+a+statutory+instrument+by+a+government+minister.%0A%0A+++++%3FprocStep+%3AbusinessItemDate+%3Fdate+.%0A+++++%23+The+majority+of+business+items+will+also+have+a+date+of+when+the+business+took+place.+For+the+purpose+of+this+query+the+date+will+be+the+date+the+instrument+was+laid+before+the+House+of+Commons.%0A%0A++%3FprocStep+%3AbusinessItemHasProcedureStep+id%3Acspzmb6w+.%0A++++%23+All+business+items+will+have+one+or+more+procedure+steps+attached.+All+procedure+steps+will+have+a+name+and+ID%2C+we+use+the+ID+to+search+for+the+step+as+it+is+constant+whereas+the+name+could+change.+The+ID+cspzmb6w+is+for+the+%22Laid+before+the+House+of+Commons+step%22.+%0A%0A++%3FprocStep+%3AbusinessItemHasProcedureStep%2Frdfs%3Alabel+%3FprocStepName.+++%0A+++++++%23+As+above+procedure+steps+will+always+have+a+name%2C+we+include+it+in+the+query+because+it's+more+accessible+for+users+than+the+procedure+ID.+%0A%0A++%3FprocStep+%3AlayingHasLayingBody%2F%3Aname+%3FlayingBodyName+.%0A%0AFILTER+(+str(%3Fdate)+%3E+'2018-01-01'+%26%26+str(%3Fdate)+%3C+'2019-01-01')%0A+++%23++This+filter+limits+the+date+the+results+will+look+for.+%0A%0A%7D&contentTypeConstruct=text%2Fturtle&contentTypeSelect=application%2Fsparql-results%2Bjson&endpoint=https%3A%2F%2Fapi.parliament.uk%2Fsparql&requestMethod=POST&tabTitle=2018+calendar+year&headers=%7B%7D&outputFormat=table)

* [2017](https://api.parliament.uk/sparql#query=%23+This+query+uses+classes+from+UK+Parliament's+procedure+ontology%3A+https%3A%2F%2Fukparliament.github.io%2Fontologies%2Fprocedure%2Fprocedure-ontology.html.%0A%0A%23+This+query+looks+for+all+statutory+instruments+laid+in+the+2017+calendar+year.+They+were+all+laid+under+one+of+the+four+main+SI+procedures+(Made+affirmative%2C+Draft+affirmative%2C+Made+negative%2C+Draft+negative)%0A%0APREFIX+rdfs%3A+%3Chttp%3A%2F%2Fwww.w3.org%2F2000%2F01%2Frdf-schema%23%3E%0APREFIX+%3A+%3Chttps%3A%2F%2Fid.parliament.uk%2Fschema%2F%3E%0APREFIX+id%3A+%3Chttps%3A%2F%2Fid.parliament.uk%2F%3E%0A%23+The+above+rows+describe+where+the+datasets+that+this+query+is+built+on+come+from.%0A%0Aselect+%3Fproc+%3FSI+%3FSIname+%3FStatutoryInstrumentYear+%3FlayingBodyName+%3FMadedate+%3FComesintoforceDate+%3FComesintoforceNote+%3FLink+%3FworkPackage+%3FprocStepName+%3Fdate+where+%7B%0A++++++%23+The+select+row+is+identifying+what+information+to+return+from+the+query.+These+are+all+variables+from+the+query+below.+%0A++%0A++%23+SPARQL+variables+start+with+a+%3F+and+can+match+any+node+(resource+or+literal)+in+the+RDF+dataset.++%0A%0A+%3FSI+a+%3AStatutoryInstrumentPaper+.++%0A+%23+An+SI+is+considered+a+workpackageable+thing+which+is+the+focus+of+a+workpackage.+%0A+%0A+++++%3FSI+rdfs%3Alabel+%3FSIname+%3B%0A++%3AstatutoryInstrumentPaperYear+%3FStatutoryInstrumentYear+.%0A+++%23+Year+is+an+important+part+of+a+statutory+instrument's+reference+as+they+are+numbered+sequentially+by+year.+At+the+beginning+of+the+year+the+count+starts+again.+%0A+%0A++%23++It+is+useful+to+be+able+to+have+queries+that+allow+information+to+be+added+to+the+solution+where+the+information+is+available%2C+but+do+not+reject+the+solution+because+some+part+of+the+query+pattern+does+not+match.+The+use+of+OPTIONAL+below+allows+this%2C+if+the+data+does+not+exist+then+it+will+still+include+the+SI+in+the+results.+The+reason+we+include+the+optional+for+the+variables+below+is+because+SIs+do+not+follow+a+strict+pattern+of+what+data+it+has.+Likewise%2C+there+can+also+be+a+delay+in+an+SI+being+published+on+Legislation.gov+so+we+also+say+links+are+optional+so+that+any+possible+instrument+appears+in+the+results+still.+%0A%0A++OPTIONAL+%7B+%3FSI+%3AworkPackagedThingHasWorkPackagedThingWebLink+%3FLink+.%7D%0A+++OPTIONAL+%7B+%3FSI+%3AstatutoryInstrumentPaperMadeDate+%3FMadedate+.%7D%0A++OPTIONAL+%7B+%3FSI+%3AstatutoryInstrumentPaperComingIntoForceDate+%3FComesintoforceDate+.+%7D%0A++OPTIONAL+%7B+%3FSI+%3AstatutoryInstrumentPaperComingIntoForceNote+%3FComesintoforceNote.+%7D%0A++%0A+++%09%3FSI+%3AworkPackagedThingHasWorkPackage+%3FworkPackage+.%0A++++%23+A+workpackage+is+a+group+of+business+items+under+a+procedure+or+as+determined+by+a+committee%2C+for+example%3A+business+items+considered+during+the+passage+of+a+particular+Statutory+Instrument.%0A%0A++%09%3FworkPackage+%3AworkPackageHasProcedure%2Frdfs%3Alabel+%3Fproc%0A+FILTER(%3Fproc+IN+(%22Draft+affirmative%22%2C+%22Draft+negative%22%2C+%22Made+affirmative%22%2C+%22Made+negative%22))%0A++++%23+Statutory+instruments+can+be+laid+under+a+number+of+procedures+with+all+having+different+routes+through+Parliament.+The+procedures+above+are+the+four+main+procedures+mapped+out+for+the+Statutory+Instrument+Service.++%0A%0A++%3FworkPackage+%3AworkPackageHasBusinessItem+%3FprocStep+.%0A++++++%23+A+business+item+is+an+item+of+business+conducted+either+within+or+outside+Parliament.+For+example%3A+the+tabling+of+an+early+day+motion%2C+a+laying+of+a+paper%2C+the+making+of+a+statutory+instrument+by+a+government+minister.%0A%0A+++++%3FprocStep+%3AbusinessItemDate+%3Fdate+.%0A+++++%23+The+majority+of+business+items+will+also+have+a+date+of+when+the+business+took+place.+For+the+purpose+of+this+query+the+date+will+be+the+date+the+instrument+was+laid+before+the+House+of+Commons.%0A%0A++%3FprocStep+%3AbusinessItemHasProcedureStep+id%3Acspzmb6w+.%0A++++%23+All+business+items+will+have+one+or+more+procedure+steps+attached.+All+procedure+steps+will+have+a+name+and+ID%2C+we+use+the+ID+to+search+for+the+step+as+it+is+constant+whereas+the+name+could+change.+The+ID+cspzmb6w+is+for+the+%22Laid+before+the+House+of+Commons+step%22.+%0A%0A++%3FprocStep+%3AbusinessItemHasProcedureStep%2Frdfs%3Alabel+%3FprocStepName.+++%0A+++++++%23+As+above+procedure+steps+will+always+have+a+name%2C+we+include+it+in+the+query+because+it's+more+accessible+for+users+than+the+procedure+ID.+%0A%0A++%3FprocStep+%3AlayingHasLayingBody%2F%3Aname+%3FlayingBodyName+.%0A%0A++FILTER+(+str(%3Fdate)+%3E+'2017-01-01'+%26%26+str(%3Fdate)+%3C+'2018-01-01')%0A+++%23++This+filter+limits+the+date+the+results+will+look+for.+%0A%0A%7D&contentTypeConstruct=text%2Fturtle&contentTypeSelect=application%2Fsparql-results%2Bjson&endpoint=https%3A%2F%2Fapi.parliament.uk%2Fsparql&requestMethod=POST&tabTitle=2017+calendar+year&headers=%7B%7D&outputFormat=table)
Expand Down

0 comments on commit 9caeb4a

Please sign in to comment.