The first query should be something like

SELECT DISTINCT ?entity ?entityLabel ?value ?valueLabel WHERE {
  ?entity <select>
  MINUS{?entity wdt:<grouping> ?grouping}.
  ?entity p:<prop> ?prop.
  OPTIONAL { ?prop ps:<prop> ?value. }
  SERVICE wikibase:label { bd:serviceParam wikibase:language "[AUTO_LANGUAGE],en". }
}

The second query something like

SELECT DISTINCT ?entity ?entityLabel WHERE {
  ?entity <select>
  MINUS {
    { ?entity wdt:<grouping> ?grouping.  }
    UNION
    { ?entity rdf:type wdno:<prop>. }
    UNION
    { ?entity wdt:<prop> ?prop. }
  }
  SERVICE wikibase:label { bd:serviceParam wikibase:language "[AUTO_LANGUAGE],en". }
}

Note that I have since then broken the linked dashboard. Feel free to revert if that aids with errorfinding

In T237182, @Lokal_Profil wrote:

The first is that the property does get passed on to the tool. This is because it does not get written to the template at all for cells in this row.

Patch for this is up

Part 1: https://github.com/JeanFred/inteGraality/pull/5
Part 2: https://github.com/JeanFred/inteGraality/pull/6

Mentioned in SAL (#wikimedia-cloud) [2019-11-04T17:35:18Z] <wm-bot> <jeanfred> Deploy latest from Git master: 471deddd (T237182)

Mentioned in SAL (#wikimedia-cloud) [2019-11-06T09:01:19Z] <wm-bot> <jeanfred> Deploy latest from Git master: 29b19c3 (T237182)

Mentioned in SAL (#wikimedia-cloud) [2019-12-02T06:40:57Z] <wm-bot> <jeanfred> Deploy latest from Git master: 770cc93 (T237182)